diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
4 files changed, 6 insertions, 28 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 2e5c1d56c9..a1454b23d2 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 @@ -33,7 +33,6 @@ import com.google.devtools.build.lib.analysis.config.HostTransition; import com.google.devtools.build.lib.analysis.config.RunUnder; import com.google.devtools.build.lib.analysis.constraints.EnvironmentRule; import com.google.devtools.build.lib.analysis.test.TestConfiguration; -import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.Attribute.LabelLateBoundDefault; import com.google.devtools.build.lib.packages.Attribute.LabelListLateBoundDefault; @@ -82,16 +81,6 @@ public class BaseRuleClasses { BuildConfiguration.class, (rule, attributes, configuration) -> configuration.getActionListeners()); - public static final String DEFAULT_COVERAGE_SUPPORT_VALUE = "//tools/test:coverage_support"; - - public static LabelLateBoundDefault<TestConfiguration> coverageSupportAttribute( - Label defaultValue) { - return LabelLateBoundDefault.fromTargetConfiguration( - TestConfiguration.class, - defaultValue, - (rule, attributes, configuration) -> configuration.getCoverageSupport()); - } - // TODO(b/65746853): provide a way to do this without passing the entire configuration /** Implementation for the :run_under attribute. */ @AutoCodec @@ -162,9 +151,8 @@ public class BaseRuleClasses { .value(env.getToolsLabel("//tools/test:collect_coverage"))) // Input files for test actions collecting code coverage .add( - attr(":coverage_support", LABEL) - .value( - coverageSupportAttribute(env.getToolsLabel(DEFAULT_COVERAGE_SUPPORT_VALUE)))) + attr("$coverage_support", LABEL) + .value(env.getLabel("//tools/defaults:coverage_support"))) // Used in the one-per-build coverage report generation action. .add( attr("$coverage_report_generator", LABEL) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java index 73236d45da..b93f357939 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java @@ -183,12 +183,9 @@ public class SkylarkRuleClassFunctions implements SkylarkRuleFunctionsApi<Artifa .value(labelCache.getUnchecked(toolsRepository + "//tools/test:collect_coverage"))) // Input files for test actions collecting code coverage .add( - attr(":coverage_support", LABEL) + attr("$coverage_support", LABEL) .cfg(HostTransition.INSTANCE) - .value( - BaseRuleClasses.coverageSupportAttribute( - labelCache.getUnchecked( - toolsRepository + BaseRuleClasses.DEFAULT_COVERAGE_SUPPORT_VALUE)))) + .value(labelCache.getUnchecked("//tools/defaults:coverage_support"))) // Used in the one-per-build coverage report generation action. .add( attr("$coverage_report_generator", LABEL) 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 b6b59414f6..936ebd77f2 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 @@ -217,8 +217,8 @@ public final class TestActionBuilder { // exec paths of all source files that should be included into the code coverage output. NestedSet<Artifact> metadataFiles = instrumentedFiles.getInstrumentationMetadataFiles(); inputsBuilder.addTransitive(metadataFiles); - inputsBuilder.addTransitive( - PrerequisiteArtifacts.nestedSet(ruleContext, ":coverage_support", Mode.DONT_CHECK)); + inputsBuilder.addTransitive(PrerequisiteArtifacts.nestedSet( + ruleContext, "$coverage_support", Mode.DONT_CHECK)); // We don't add this attribute to non-supported test target if (ruleContext.isAttrDefined("$lcov_merger", LABEL)) { TransitiveInfoCollection lcovMerger = diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java index 1749528904..6247fde3cc 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java @@ -176,13 +176,6 @@ public class TestConfiguration extends Fragment { "coverage_support", ImmutableSet.of(coverageSupport), "coverage_report_generator", ImmutableSet.of(coverageReportGenerator)); } - - @Override - public FragmentOptions getHost() { - TestOptions hostOptions = (TestOptions) getDefault(); - hostOptions.coverageSupport = this.coverageSupport; - return hostOptions; - } } /** Configuration loader for test options */ |