From c1ae939e2e27c928dc87ca64280948d93fdb056a Mon Sep 17 00:00:00 2001 From: ilist Date: Wed, 4 Nov 2020 06:16:39 -0800 Subject: [PATCH] Automated rollback of commit c266ac966761c4b3d8a408a03e407505c93effdd. *** Reason for rollback *** Broke Bazel Toolchain on RBE https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/1743#1dba3b6d-8ea5-4efc-b696-f48e62b035fa *** Original change description *** Work towards #12006 Allow exec groups to inherit from the rule or other exec groups Add a "test" exec group for TestRunnerActions. This will allow users to set {"test.key", "value"} inside their exec properties and {"key", "value"} will propagate as to just TestRunnerActions. This addresses user request https://github.com/bazelbuild/bazel/issues/10799 PiperOrigin-RevId: 340635429 --- .../devtools/build/lib/analysis/BaseRuleClasses.java | 3 --- .../build/lib/analysis/test/TestActionBuilder.java | 9 +-------- 2 files changed, 1 insertion(+), 11 deletions(-) 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 index 200f9a5225384e..b5375509c7ce84 100644 --- 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,8 +148,6 @@ public static LabelLateBoundDefault getCoverageOutputGenerat return runUnder != null ? runUnder.getLabel() : null; }); - public static final String TEST_RUNNER_EXEC_GROUP = "test"; - /** * A base rule for all test rules. */ @@ -157,7 +155,6 @@ 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 index 6e6c04f23eed19..0430d2e7180107 100644 --- 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; @@ -149,11 +147,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. @@ -392,7 +385,7 @@ private TestParams createTestAction(int shards) { boolean splitCoveragePostProcessing = testConfiguration.splitCoveragePostProcessing(); TestRunnerAction testRunnerAction = new TestRunnerAction( - getOwner(), + ruleContext.getActionOwner(), inputs, testRunfilesSupplier, testActionExecutable,