Automated rollback of commit bb0aba3e91b603bf96d4e214a3886d1f47c3d90a.

*** Reason for rollback ***

Publishing duplicate build events for tests.

*** Original change description ***

Request test artifacts to be built in parallel with running the test.

In cases where not all test artifacts are needed to run the test, this allows for greater parallelism in the build.

We need to inject the request for the test to be run into the TargetCompletion function, so that it can properly process any errors. Thanks to nharmata@ for suggesting this.

MEMORY: One additional Skyframe node and 2 edges for each test to be run (sharded tests still only count as one). So with 500 test target...

***

PiperOrigin-RevId: 166307568

1 files changed, 5 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java
index 16977df4dd..8808252848 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java
@@ -32,13 +32,11 @@ import com.google.devtools.build.skyframe.SkyKey;
  */
 public class ActionArtifactCycleReporter extends AbstractLabelCycleReporter {
   @SuppressWarnings("unchecked")
-  private static final Predicate<SkyKey> IS_ARTIFACT_OR_ACTION_SKY_KEY =
-      Predicates.or(
-          SkyFunctions.isSkyFunction(SkyFunctions.ARTIFACT),
-          SkyFunctions.isSkyFunction(SkyFunctions.ACTION_EXECUTION),
-          SkyFunctions.isSkyFunction(SkyFunctions.TARGET_COMPLETION),
-          SkyFunctions.isSkyFunction(SkyFunctions.TEST_COMPLETION),
-          SkyFunctions.isSkyFunction(SkyFunctions.TEST_EXECUTION));
+  private static final Predicate<SkyKey> IS_ARTIFACT_OR_ACTION_SKY_KEY = Predicates.or(
+      SkyFunctions.isSkyFunction(SkyFunctions.ARTIFACT),
+      SkyFunctions.isSkyFunction(SkyFunctions.ACTION_EXECUTION),
+      SkyFunctions.isSkyFunction(SkyFunctions.TARGET_COMPLETION),
+      SkyFunctions.isSkyFunction(SkyFunctions.TEST_COMPLETION));
 
   ActionArtifactCycleReporter(PackageProvider packageProvider) {
     super(packageProvider);
@@ -60,10 +58,6 @@ public class ActionArtifactCycleReporter extends AbstractLabelCycleReporter {
     } else if (arg instanceof TestCompletionKey
         && skyFunctionName.equals(SkyFunctions.TEST_COMPLETION)) {
       return  "test target: " + ((TestCompletionKey) arg).labelAndConfiguration().getLabel();
-    } else if (arg instanceof TestExecutionFunction.TestExecutionKey
-        && skyFunctionName.equals(SkyFunctions.TEST_EXECUTION)) {
-      return "test target: "
-          + ((TestExecutionFunction.TestExecutionKey) arg).getLabelAndConfiguration().getLabel();
     }
     throw new IllegalStateException(
         "Argument is not Action, TargetCompletion, TestCompletion or OwnedArtifact: " + arg);
@@ -82,9 +76,6 @@ public class ActionArtifactCycleReporter extends AbstractLabelCycleReporter {
     } else if (arg instanceof TestCompletionKey
         && key.functionName().equals(SkyFunctions.TEST_COMPLETION)) {
       return  ((TestCompletionKey) arg).labelAndConfiguration().getLabel();
-    } else if (arg instanceof TestExecutionFunction.TestExecutionKey
-        && key.functionName().equals(SkyFunctions.TEST_EXECUTION)) {
-      return ((TestExecutionFunction.TestExecutionKey) arg).getLabelAndConfiguration().getLabel();
     }
     throw new IllegalStateException(
         "Argument is not Action, TargetCompletion, TestCompletion or OwnedArtifact: " + arg);