aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/pkgcache
diff options
context:
space:
mode:
authorGravatar Ulf Adams <ulfjack@google.com>2016-02-12 09:59:22 +0000
committerGravatar Dmitry Lomov <dslomov@google.com>2016-02-12 15:24:09 +0000
commit08663e6cb80b256736a9f201df6e06f908589f32 (patch)
tree9e400725a23e2d8d41a8c7f531602d7da003f01c /src/test/java/com/google/devtools/build/lib/pkgcache
parent10b24a7102c4221fbeb9e3cdbe87822e1fa51377 (diff)
Add an experimental flag to enable the Skyframe-based loading phase runner.
Refactor the CommandEnvironment to no longer create a LoadingPhaseRunner eagerly. Unfortunately, that means we can't reuse the TargetPatternEvaluator either. Fortunately, the SkyframeTargetPatternEvaluator is a very lightweight class, which only contains the offset as state, so we just create a new instance whenever we need one. On the plus side, the LoadingPhaseRunner API is now stateless, and the QueryCommand no longer creates a unnecessary LoadingPhaseRunner instance. -- MOS_MIGRATED_REVID=114519731
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/pkgcache')
-rw-r--r--src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java5
1 files changed, 3 insertions, 2 deletions
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) {