Revert "Allow exec groups to inherit from the rule or other exec groups."

philwo · philwo · commit cb6e5c24b82e · 2021-05-20T13:01:14.000+02:00
This reverts commit 3486b78. Signed-off-by: Philipp Wollermann <philwo@google.com>
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -148,16 +148,13 @@ public static LabelLateBoundDefault<BuildConfiguration> getCoverageOutputGenerat
             return runUnder != null ? runUnder.getLabel() : null;
           });
 
-  public static final String TEST_RUNNER_EXEC_GROUP = "test";
-
   /**
    * A base rule for all test rules.
    */
   public static final class TestBaseRule implements RuleDefinition {
     @Override
     public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
       return builder
-          .addExecGroup(TEST_RUNNER_EXEC_GROUP)
           .requiresConfigurationFragments(TestConfiguration.class)
           // TestConfiguration only needed to create TestAction and TestProvider
           // Only necessary at top-level and can be skipped if trimmed.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestActionBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestActionBuilder.java
@@ -14,14 +14,12 @@
 
 package com.google.devtools.build.lib.analysis.test;
 
-import static com.google.devtools.build.lib.analysis.BaseRuleClasses.TEST_RUNNER_EXEC_GROUP;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.devtools.build.lib.actions.ActionInput;
-import com.google.devtools.build.lib.actions.ActionOwner;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.ArtifactRoot;
 import com.google.devtools.build.lib.actions.RunfilesSupplier;
@@ -148,11 +146,6 @@ private boolean isPersistentTestRunner() {
         && persistentTestRunnerRunfiles != null;
   }
 
-  private ActionOwner getOwner() {
-    ActionOwner owner = ruleContext.getActionOwner(TEST_RUNNER_EXEC_GROUP);
-    return owner == null ? ruleContext.getActionOwner() : owner;
-  }
-
   /**
    * Creates a test action and artifacts for the given rule. The test action will use the specified
    * executable and runfiles.
@@ -391,7 +384,7 @@ private TestParams createTestAction(int shards) throws InterruptedException {
         boolean splitCoveragePostProcessing = testConfiguration.splitCoveragePostProcessing();
         TestRunnerAction testRunnerAction =
             new TestRunnerAction(
-                getOwner(),
+                ruleContext.getActionOwner(),
                 inputs,
                 testRunfilesSupplier,
                 testActionExecutable,
