[Skymeld] Request the building of exclusive test targets before seque…

…ntially run them later on.

Prior to this CL, we'd only _build_ the exclusive targets sequentially right before running them. This was a deviation from the behavior of non-Skymeld blaze, where these targets are first built in parallel and then run sequentially.

PiperOrigin-RevId: 539645460
Change-Id: I28212b6efca7ea84294aac338ecd4c9340e2f701

src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java

@@ -75,7 +75,6 @@
 import com.google.devtools.build.skyframe.SkyValue;
 import com.google.devtools.build.skyframe.SkyframeLookupResult;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -505,17 +504,16 @@ private void requestConfiguredTargetExecution(
         configuredTarget.getProvider(ExtraActionArtifactsProvider.class),
         artifactsToBuild,
         buildDriverKey.isExtraActionTopLevelOnly());
+    ImmutableSet.Builder<SkyKey> keysToRequest =
+        ImmutableSet.<SkyKey>builder().addAll(Artifact.keys(artifactsToBuild.build()));
     postEventIfNecessary(postedEventsTypes, env, SomeExecutionStartedEvent.create());
     if (testType.equals(NOT_TEST)) {
-      declareDependenciesAndCheckValues(
-          env,
-          Iterables.concat(
-              Artifact.keys(artifactsToBuild.build()),
-              Collections.singletonList(
-                  TargetCompletionValue.key(
-                      ConfiguredTargetKey.fromConfiguredTarget(configuredTarget),
-                      topLevelArtifactContext,
-                      false))));
+      keysToRequest.add(
+          TargetCompletionValue.key(
+              ConfiguredTargetKey.fromConfiguredTarget(configuredTarget),
+              topLevelArtifactContext,
+              /* willTest= */ false));
+      declareDependenciesAndCheckValues(env, keysToRequest.build());
       return;
     }
 
@@ -529,20 +527,22 @@ private void requestConfiguredTargetExecution(
 
     if (testType.equals(PARALLEL)) {
       // Only run non-exclusive tests here. Exclusive tests need to be run sequentially later.
-      declareDependenciesAndCheckValues(
-          env,
-          Iterables.concat(
-              artifactsToBuild.build(),
-              Collections.singletonList(
-                  TestCompletionValue.key(
-                      ConfiguredTargetKey.fromConfiguredTarget(configuredTarget),
-                      topLevelArtifactContext,
-                      /* exclusiveTesting= */ false))));
+      keysToRequest.add(
+          TestCompletionValue.key(
+              ConfiguredTargetKey.fromConfiguredTarget(configuredTarget),
+              topLevelArtifactContext,
+              /* exclusiveTesting= */ false));
+      declareDependenciesAndCheckValues(env, keysToRequest.build());
       return;
     }
 
     // Exclusive tests will be run with sequential Skyframe evaluations afterwards.
-    declareDependenciesAndCheckValues(env, artifactsToBuild.build());
+    keysToRequest.add(
+        TargetCompletionValue.key(
+            ConfiguredTargetKey.fromConfiguredTarget(configuredTarget),
+            topLevelArtifactContext,
+            /* willTest= */ true));
+    declareDependenciesAndCheckValues(env, keysToRequest.build());
   }
 
   private void announceAspectAnalysisDoneAndRequestExecution(