diff options
Diffstat (limited to 'src/test/java/com/google/devtools')
3 files changed, 8 insertions, 7 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 e3bc39a3eb..3177249cb8 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 @@ -253,8 +253,8 @@ public abstract class AnalysisTestCase extends FoundationTestCase { ModifiedFileSet.EVERYTHING_MODIFIED, rootDirectory); LoadingResult loadingResult = loadingPhaseRunner - .execute(reporter, eventBus, ImmutableList.copyOf(labels), loadingOptions, - buildOptions.getAllLabels(), viewOptions.keepGoing, isLoadingEnabled(), + .execute(reporter, eventBus, ImmutableList.copyOf(labels), PathFragment.EMPTY_FRAGMENT, + loadingOptions, buildOptions.getAllLabels(), viewOptions.keepGoing, isLoadingEnabled(), /*determineTests=*/false, /*callback=*/null); BuildRequestOptions requestOptions = optionsParser.getOptions(BuildRequestOptions.class); 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 47e9ebcf72..d32a0c68d1 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 @@ -1334,9 +1334,9 @@ public abstract class BuildViewTestCase extends FoundationTestCase { LoadingPhaseRunner runner = new LegacyLoadingPhaseRunner(getPackageManager(), Collections.unmodifiableSet(ruleClassProvider.getRuleClassMap().keySet())); - LoadingResult loadingResult = runner.execute(reporter, eventBus, targets, loadingOptions, - getTargetConfiguration().getAllLabels(), viewOptions.keepGoing, - isLoadingEnabled(), /*determineTests=*/false, /*callback=*/null); + LoadingResult loadingResult = runner.execute(reporter, eventBus, targets, + PathFragment.EMPTY_FRAGMENT, loadingOptions, getTargetConfiguration().getAllLabels(), + viewOptions.keepGoing, isLoadingEnabled(), /*determineTests=*/false, /*callback=*/null); if (!doAnalysis) { // TODO(bazel-team): What's supposed to happen in this case? return null; diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java index 1c1c2ad8a5..77b9ad81ec 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java @@ -715,8 +715,9 @@ public class LoadingPhaseRunnerTest { FilteredTargetListener listener = new FilteredTargetListener(); eventBus.register(listener); result = loadingPhaseRunner.execute(storedErrors, eventBus, - ImmutableList.copyOf(patterns), options, ImmutableListMultimap.<String, Label>of(), - keepGoing, /*enableLoading=*/true, determineTests, loadingCallback); + ImmutableList.copyOf(patterns), PathFragment.EMPTY_FRAGMENT, options, + ImmutableListMultimap.<String, Label>of(), keepGoing, /*enableLoading=*/true, + determineTests, loadingCallback); this.targetParsingCompleteEvent = listener.targetParsingCompleteEvent; this.loadingPhaseCompleteEvent = listener.loadingPhaseCompleteEvent; } catch (LoadingFailedException e) { |