diff options
15 files changed, 52 insertions, 52 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java index 600afdf409..a84bb94c19 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java @@ -752,10 +752,10 @@ public class BuildView { Collection<ConfiguredTarget> configuredTargets) { NestedSetBuilder<Artifact> baselineCoverageArtifacts = NestedSetBuilder.stableOrder(); for (ConfiguredTarget target : configuredTargets) { - TopLevelArtifactProvider provider = target.getProvider(TopLevelArtifactProvider.class); + OutputGroupProvider provider = target.getProvider(OutputGroupProvider.class); if (provider != null) { baselineCoverageArtifacts.addTransitive(provider.getOutputGroup( - TopLevelArtifactProvider.BASELINE_COVERAGE + OutputGroupProvider.BASELINE_COVERAGE )); } } @@ -790,8 +790,8 @@ public class BuildView { Collection<ConfiguredTarget> targetsToTestExclusive, TopLevelArtifactContext topLevelOptions, Collection<ConfiguredTarget> allTestTargets) { Set<String> outputGroups = topLevelOptions.outputGroups(); - if (!outputGroups.contains(TopLevelArtifactProvider.FILES_TO_COMPILE) - && !outputGroups.contains(TopLevelArtifactProvider.COMPILATION_PREREQUISITES) + if (!outputGroups.contains(OutputGroupProvider.FILES_TO_COMPILE) + && !outputGroups.contains(OutputGroupProvider.COMPILATION_PREREQUISITES) && allTestTargets != null) { scheduleTests(targetsToTest, targetsToTestExclusive, allTestTargets, topLevelOptions.runTestsExclusively()); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java index 5b46cc2ce2..40ba247929 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupProvider.java @@ -35,7 +35,7 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; * not mentioned on the output. */ @Immutable -public final class TopLevelArtifactProvider implements TransitiveInfoProvider { +public final class OutputGroupProvider implements TransitiveInfoProvider { /** * Prefix for output groups that are not reported to the user on the terminal output of Blaze when @@ -87,7 +87,7 @@ public final class TopLevelArtifactProvider implements TransitiveInfoProvider { private final ImmutableMap<String, NestedSet<Artifact>> outputGroups; - TopLevelArtifactProvider(ImmutableMap<String, NestedSet<Artifact>> outputGroups) { + OutputGroupProvider(ImmutableMap<String, NestedSet<Artifact>> outputGroups) { this.outputGroups = outputGroups; } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java index cf57d700d0..b6f4bfe1f1 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java @@ -100,7 +100,7 @@ public final class RuleConfiguredTargetBuilder { if (runfilesSupport != null) { // If a binary is built, build its runfiles, too addOutputGroup( - TopLevelArtifactProvider.HIDDEN_TOP_LEVEL, runfilesSupport.getRunfilesMiddleman()); + OutputGroupProvider.HIDDEN_TOP_LEVEL, runfilesSupport.getRunfilesMiddleman()); } else if (providers.get(RunfilesProvider.class) != null) { // If we don't have a RunfilesSupport (probably because this is not a binary rule), we still // want to build the files this rule contributes to runfiles of dependent rules so that we @@ -109,7 +109,7 @@ public final class RuleConfiguredTargetBuilder { // Note that this is a best-effort thing: there is .getDataRunfiles() and all the language- // specific *RunfilesProvider classes, which we don't add here for reasons that are lost in // the mists of time. - addOutputGroup(TopLevelArtifactProvider.HIDDEN_TOP_LEVEL, + addOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL, ((RunfilesProvider) providers.get(RunfilesProvider.class)) .getDefaultRunfiles().getAllArtifacts()); } @@ -127,7 +127,7 @@ public final class RuleConfiguredTargetBuilder { outputGroups.put(entry.getKey(), entry.getValue().build()); } - add(TopLevelArtifactProvider.class, new TopLevelArtifactProvider(outputGroups.build())); + add(OutputGroupProvider.class, new OutputGroupProvider(outputGroups.build())); } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java index 8a431a6d2c..54edf029a0 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java @@ -109,23 +109,23 @@ public final class TopLevelArtifactHelper { NestedSetBuilder<Artifact> importantBuilder = NestedSetBuilder.stableOrder(); NestedSetBuilder<Artifact> allBuilder = NestedSetBuilder.stableOrder(); - TopLevelArtifactProvider topLevelArtifactProvider = - target.getProvider(TopLevelArtifactProvider.class); + OutputGroupProvider outputGroupProvider = + target.getProvider(OutputGroupProvider.class); for (String outputGroup : context.outputGroups()) { NestedSet<Artifact> results = null; - if (outputGroup.equals(TopLevelArtifactProvider.DEFAULT)) { + if (outputGroup.equals(OutputGroupProvider.DEFAULT)) { FileProvider fileProvider = target.getProvider(FileProvider.class); if (fileProvider != null) { results = fileProvider.getFilesToBuild(); } - } else if (topLevelArtifactProvider != null) { - results = topLevelArtifactProvider.getOutputGroup(outputGroup); + } else if (outputGroupProvider != null) { + results = outputGroupProvider.getOutputGroup(outputGroup); } if (results != null) { - if (outputGroup.startsWith(TopLevelArtifactProvider.HIDDEN_OUTPUT_GROUP_PREFIX)) { + if (outputGroup.startsWith(OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX)) { allBuilder.addTransitive(results); } else { importantBuilder.addTransitive(results); diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java index c9133d0fb3..a29a556749 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java @@ -22,8 +22,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedSet; import com.google.devtools.build.lib.Constants; import com.google.devtools.build.lib.analysis.BuildView; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.TopLevelArtifactContext; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.exec.ExecutionOptions; import com.google.devtools.build.lib.pkgcache.LoadingPhaseRunner; @@ -509,9 +509,9 @@ public class BuildRequest implements OptionsClassProvider { private ImmutableSortedSet<String> determineOutputGroups() { Set<String> current = new HashSet<>(); - current.add(TopLevelArtifactProvider.TEMP_FILES); - current.add(TopLevelArtifactProvider.HIDDEN_TOP_LEVEL); - current.add(TopLevelArtifactProvider.DEFAULT); + current.add(OutputGroupProvider.TEMP_FILES); + current.add(OutputGroupProvider.HIDDEN_TOP_LEVEL); + current.add(OutputGroupProvider.DEFAULT); for (String outputGroup : getBuildOptions().outputGroups) { if (outputGroup.startsWith("-")) { diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java index b114efbdf4..bd48395081 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java @@ -52,9 +52,9 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.FileProvider; import com.google.devtools.build.lib.analysis.InputFileConfiguredTarget; import com.google.devtools.build.lib.analysis.OutputFileConfiguredTarget; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.TopLevelArtifactContext; import com.google.devtools.build.lib.analysis.TopLevelArtifactHelper; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.ViewCreationFailedException; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction; @@ -699,10 +699,10 @@ public class ExecutionTool { // For failed compilation, it is still useful to examine temp artifacts, // (ie, preprocessed and assembler files). - TopLevelArtifactProvider topLevelProvider = - target.getProvider(TopLevelArtifactProvider.class); + OutputGroupProvider topLevelProvider = + target.getProvider(OutputGroupProvider.class); if (topLevelProvider != null) { - for (Artifact temp : topLevelProvider.getOutputGroup(TopLevelArtifactProvider.TEMP_FILES)) { + for (Artifact temp : topLevelProvider.getOutputGroup(OutputGroupProvider.TEMP_FILES)) { if (temp.getPath().exists()) { outErr.printErrLn(" See temp at " + OutputDirectoryLinksUtils.getPrettyPath(temp.getPath(), diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java index 7b9a461c15..c44aac0ce0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java @@ -24,13 +24,13 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ParameterFile; import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.ConfiguredTarget; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.RunfilesSupport; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.Util; import com.google.devtools.build.lib.analysis.actions.FileWriteAction; @@ -308,7 +308,7 @@ public abstract class CcBinary implements RuleConfiguredTargetFactory { .addProvider(LipoContextProvider.class, new LipoContextProvider( cppCompilationContext, ImmutableMap.copyOf(scannableMap))) .addProvider(CppLinkAction.Context.class, linkContext) - .addOutputGroup(TopLevelArtifactProvider.BASELINE_COVERAGE, + .addOutputGroup(OutputGroupProvider.BASELINE_COVERAGE, createBaselineCoverageArtifacts(ruleContext, common, ccCompilationOutputs, fake)) .build(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java index 64bd28e237..b265d2362a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java @@ -23,10 +23,10 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.AnalysisUtils; import com.google.devtools.build.lib.analysis.FileProvider; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; @@ -714,10 +714,10 @@ public final class CcCommon { instrumentedObjectFiles)) .add(CppDebugFileProvider.class, new CppDebugFileProvider( dwoArtifacts.getDwoArtifacts(), dwoArtifacts.getPicDwoArtifacts())) - .addOutputGroup(TopLevelArtifactProvider.TEMP_FILES, getTemps(ccCompilationOutputs)) - .addOutputGroup(TopLevelArtifactProvider.FILES_TO_COMPILE, + .addOutputGroup(OutputGroupProvider.TEMP_FILES, getTemps(ccCompilationOutputs)) + .addOutputGroup(OutputGroupProvider.FILES_TO_COMPILE, NestedSetBuilder.wrap(Order.STABLE_ORDER, getFilesToCompile(ccCompilationOutputs))) - .addOutputGroup(TopLevelArtifactProvider.COMPILATION_PREREQUISITES, + .addOutputGroup(OutputGroupProvider.COMPILATION_PREREQUISITES, collectCompilationPrerequisites(ruleContext, cppCompilationContext)); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java index 50654e6b67..fa74a3ac55 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java @@ -20,12 +20,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredTarget; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesProvider; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; @@ -265,8 +265,8 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { .add(CppRunfilesProvider.class, new CppRunfilesProvider(staticRunfiles, sharedRunfiles)) .add(ImplementedCcPublicLibrariesProvider.class, new ImplementedCcPublicLibrariesProvider(getImplementedCcPublicLibraries(ruleContext))) - .addOutputGroup(TopLevelArtifactProvider.HIDDEN_TOP_LEVEL, artifactsToForce) - .addOutputGroup(TopLevelArtifactProvider.BASELINE_COVERAGE, BaselineCoverageAction + .addOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL, artifactsToForce) + .addOutputGroup(OutputGroupProvider.BASELINE_COVERAGE, BaselineCoverageAction .getBaselineCoverageArtifacts(ruleContext, instrumentedFilesProvider.getInstrumentedFiles())); @@ -278,10 +278,10 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory { NestedSetBuilder<Artifact> artifactsToForceBuilder = NestedSetBuilder.stableOrder(); artifactsToForceBuilder.addTransitive( NestedSetBuilder.wrap(Order.STABLE_ORDER, common.getFilesToCompile(ccCompilationOutputs))); - for (TopLevelArtifactProvider dep : - ruleContext.getPrerequisites("deps", Mode.TARGET, TopLevelArtifactProvider.class)) { + for (OutputGroupProvider dep : + ruleContext.getPrerequisites("deps", Mode.TARGET, OutputGroupProvider.class)) { artifactsToForceBuilder.addTransitive( - dep.getOutputGroup(TopLevelArtifactProvider.HIDDEN_TOP_LEVEL)); + dep.getOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL)); } return artifactsToForceBuilder.build(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java index 717033509d..9e31b974b8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java @@ -23,11 +23,11 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.AnalysisUtils; import com.google.devtools.build.lib.analysis.FileProvider; import com.google.devtools.build.lib.analysis.LanguageDependentFragment; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesProvider; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; @@ -648,10 +648,10 @@ public final class CcLibraryHelper { dwoArtifacts.getDwoArtifacts(), dwoArtifacts.getPicDwoArtifacts())); providers.put(TransitiveLipoInfoProvider.class, collectTransitiveLipoInfo(ccOutputs)); Map<String, NestedSet<Artifact>> outputGroups = new TreeMap<>(); - outputGroups.put(TopLevelArtifactProvider.TEMP_FILES, getTemps(ccOutputs)); + outputGroups.put(OutputGroupProvider.TEMP_FILES, getTemps(ccOutputs)); if (emitCompileProviders) { - outputGroups.put(TopLevelArtifactProvider.FILES_TO_COMPILE, getFilesToCompile(ccOutputs)); - outputGroups.put(TopLevelArtifactProvider.COMPILATION_PREREQUISITES, + outputGroups.put(OutputGroupProvider.FILES_TO_COMPILE, getFilesToCompile(ccOutputs)); + outputGroups.put(OutputGroupProvider.COMPILATION_PREREQUISITES, CcCommon.collectCompilationPrerequisites(ruleContext, cppCompilationContext)); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java index 54f0976cc5..4b7ffacaf5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java @@ -27,10 +27,10 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.AnalysisUtils; import com.google.devtools.build.lib.analysis.FileProvider; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.analysis.Util; @@ -488,10 +488,10 @@ public class JavaCommon { .add(InstrumentedFilesProvider.class, new InstrumentedFilesProviderImpl( instrumentedFilesCollector)) .add(JavaExportsProvider.class, new JavaExportsProvider(collectTransitiveExports())) - .addOutputGroup(TopLevelArtifactProvider.FILES_TO_COMPILE, getFilesToCompile(classJar)); + .addOutputGroup(OutputGroupProvider.FILES_TO_COMPILE, getFilesToCompile(classJar)); if (!TargetUtils.isTestRule(ruleContext.getTarget())) { - builder.addOutputGroup(TopLevelArtifactProvider.BASELINE_COVERAGE, + builder.addOutputGroup(OutputGroupProvider.BASELINE_COVERAGE, BaselineCoverageAction.getBaselineCoverageArtifacts(ruleContext, instrumentedFilesCollector.getInstrumentedFiles())); } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/TestCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/TestCommand.java index 094add61a3..0f384b64a1 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/TestCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/TestCommand.java @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.runtime.commands; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.buildtool.BuildRequest; import com.google.devtools.build.lib.buildtool.BuildResult; @@ -77,7 +77,7 @@ public class TestCommand implements BlazeCommand { if (optionsParser.getOptions(BuildConfiguration.Options.class).collectCodeCoverage) { optionsParser.parse(OptionPriority.SOFTWARE_REQUIREMENT, "baseline coverage artifacts are built with running tests with coverage collection", - ImmutableList.of("--output_groups=" + TopLevelArtifactProvider.BASELINE_COVERAGE)); + ImmutableList.of("--output_groups=" + OutputGroupProvider.BASELINE_COVERAGE)); } } catch (OptionsParsingException e) { throw new IllegalStateException("Known options failed to parse", e); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java index a801f0eb0d..41793bfaf0 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java @@ -41,9 +41,9 @@ import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.BuildInfoHelper; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.TopLevelArtifactContext; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction.Key; import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory.BuildInfoKey; @@ -72,7 +72,7 @@ public final class AnalysisTestUtil { public static final TopLevelArtifactContext TOP_LEVEL_ARTIFACT_CONTEXT = new TopLevelArtifactContext( /*runTestsExclusively=*/false, - /*outputGroups=*/ImmutableSortedSet.of(TopLevelArtifactProvider.DEFAULT)); + /*outputGroups=*/ImmutableSortedSet.of(OutputGroupProvider.DEFAULT)); /** * An {@link AnalysisEnvironment} implementation that collects the actions registered. diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 2e316b9004..d1b99e7067 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -51,12 +51,12 @@ import com.google.devtools.build.lib.analysis.FileConfiguredTarget; import com.google.devtools.build.lib.analysis.FileProvider; import com.google.devtools.build.lib.analysis.FilesToRunProvider; import com.google.devtools.build.lib.analysis.LabelAndConfiguration; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.RunfilesSupport; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction; @@ -1091,7 +1091,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { protected NestedSet<Artifact> getOutputGroup( TransitiveInfoCollection target, String outputGroup) { - TopLevelArtifactProvider provider = target.getProvider(TopLevelArtifactProvider.class); + OutputGroupProvider provider = target.getProvider(OutputGroupProvider.class); return provider == null ? NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER) : provider.getOutputGroup(outputGroup); @@ -1364,8 +1364,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { protected Iterable<String> baselineCoverageArtifactBasenames(ConfiguredTarget target) throws Exception { Artifact baselineCoverage = Iterables.getOnlyElement(target - .getProvider(TopLevelArtifactProvider.class) - .getOutputGroup(TopLevelArtifactProvider.BASELINE_COVERAGE)); + .getProvider(OutputGroupProvider.class) + .getOutputGroup(OutputGroupProvider.BASELINE_COVERAGE)); BaselineCoverageAction baselineAction = (BaselineCoverageAction) getGeneratingAction(baselineCoverage); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java index 0d931f4b63..ce7bb412c3 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java @@ -15,7 +15,7 @@ package com.google.devtools.build.lib.analysis.util; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; /** * Common code for unit tests that validate --compile_only behavior. @@ -23,7 +23,7 @@ import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; public abstract class CompileOnlyTestCase extends BuildViewTestCase { protected Artifact getArtifactByExecPathSuffix(ConfiguredTarget target, String path) { - for (Artifact artifact : getOutputGroup(target, TopLevelArtifactProvider.FILES_TO_COMPILE)) { + for (Artifact artifact : getOutputGroup(target, OutputGroupProvider.FILES_TO_COMPILE)) { if (artifact.getExecPathString().endsWith(path)) { return artifact; } |