diff options
author | gregce <gregce@google.com> | 2017-08-10 21:51:15 +0200 |
---|---|---|
committer | Marcel Hlopko <hlopko@google.com> | 2017-08-11 12:56:25 +0200 |
commit | d79b9373060be9f4ae30b4b0ebed1dd7d8fd526a (patch) | |
tree | 9c61a36eb2a12625b98ac2164397fb1dd4685644 /src/test/java/com/google/devtools/build/lib/analysis/util | |
parent | 43d8a79ece7dfa77a3ed1b81d732be699d1c1fe9 (diff) |
Pass List<ConfigurationFragmentFactory> to SkyframeExecutor instead of ConfigurationFactory.
This is a prerequisite to removing ConfigurationFactory (which is only used for static configurations). We still need List<ConfigurationFragmentFactory> to supply ConfigurationFragmentFunction.
Eventually even that will go away (for fully trimmed builds). But we're not there yet.
PiperOrigin-RevId: 164890139
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util')
3 files changed, 6 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java index 9d8ba307ff..6e3a0f1bef 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java @@ -361,8 +361,8 @@ public abstract class AnalysisTestCase extends FoundationTestCase { BuildRequestOptions requestOptions = optionsParser.getOptions(BuildRequestOptions.class); ImmutableSortedSet<String> multiCpu = ImmutableSortedSet.copyOf(requestOptions.multiCpus); - masterConfig = skyframeExecutor.createConfigurations( - reporter, configurationFactory, buildOptions, multiCpu, false); + masterConfig = skyframeExecutor.createConfigurations(reporter, + configurationFactory.getFactories(), buildOptions, multiCpu, false); analysisResult = buildView.update( loadingResult, 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 ae0c922a15..949b73854c 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 @@ -320,8 +320,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { BuildOptions buildOptions = ruleClassProvider.createBuildOptions(optionsParser); skyframeExecutor.invalidateConfigurationCollection(); - return skyframeExecutor.createConfigurations(reporter, configurationFactory, buildOptions, - ImmutableSet.<String>of(), false); + return skyframeExecutor.createConfigurations(reporter, configurationFactory.getFactories(), + buildOptions, ImmutableSet.<String>of(), false); } protected Target getTarget(String label) diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java index 6ec9c815a9..3ccaea2ae9 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java @@ -181,7 +181,8 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { skyframeExecutor.handleDiffs(reporter); BuildConfigurationCollection collection = skyframeExecutor.createConfigurations(reporter, - configurationFactory, BuildOptions.of(buildOptionClasses, parser), multiCpu, false); + configurationFactory.getFactories(), BuildOptions.of(buildOptionClasses, parser), multiCpu, + false); return collection; } |