diff options
Diffstat (limited to 'src/test/java')
3 files changed, 5 insertions, 6 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 8183f248d5..e116f0a441 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 @@ -274,7 +274,7 @@ 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, directories, multiCpu, false); + reporter, configurationFactory, 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 a690340f7c..d71b8ba786 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 @@ -285,7 +285,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { ensureTargetsVisited(buildOptions.getAllLabels().values()); skyframeExecutor.invalidateConfigurationCollection(); return skyframeExecutor.createConfigurations(reporter, configurationFactory, buildOptions, - directories, ImmutableSet.<String>of(), false); + 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 f7c83ff810..a973f8cbec 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 @@ -39,7 +39,6 @@ import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker; -import com.google.devtools.build.lib.skyframe.SkyframeExecutor; import com.google.devtools.build.lib.testutil.FoundationTestCase; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; @@ -80,7 +79,7 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { public List<String> multiCpus; } - protected SkyframeExecutor skyframeExecutor; + protected SequencedSkyframeExecutor skyframeExecutor; protected ConfigurationFactory configurationFactory; protected Path workspace; protected ImmutableList<Class<? extends FragmentOptions>> buildOptionClasses; @@ -163,9 +162,9 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { parser.getOptions(TestOptions.class).multiCpus); BuildOptions buildOptions = BuildOptions.of(buildOptionClasses, parser); + skyframeExecutor.handleDiffs(reporter); BuildConfigurationCollection collection = skyframeExecutor.createConfigurations( - reporter, configurationFactory, buildOptions, - new BlazeDirectories(outputBase, outputBase, workspace), multiCpu, false); + reporter, configurationFactory, buildOptions, multiCpu, false); return collection; } |