Skip to content

Commit

Permalink
Revert "Allow exec groups to inherit from the rule or other exec grou…
Browse files Browse the repository at this point in the history
…ps."

This reverts commit 3486b78.

Signed-off-by: Philipp Wollermann <philwo@google.com>
  • Loading branch information
philwo committed May 20, 2021
1 parent 51fb9e1 commit cb6e5c2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit cb6e5c2

Please sign in to comment.