commit 3b63a4e67c547a656000dfd4e9d61f68a21b92d8
author janakr <janakr@google.com> Thu Sep 14 09:55:40 2017 +0200
committer Philipp Wollermann <philwo@google.com> Thu Sep 14 18:47:27 2017 +0200
tree fa84bb33fd9741aa5a59de627909e0f5dd984e5f
parent aa437e01b1879f0e1ba0452ce6137d80586258da

Remove deepExecRoot from BlazeDirectories. It is now the default. Also inline constructor that did ServerDirectories creation inline: don't pollute production code for tests' convenience.

PiperOrigin-RevId: 168652349

src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
index 9eb5b20..2afdf03 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.eventbus.EventBus;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
+import com.google.devtools.build.lib.analysis.ServerDirectories;
 import com.google.devtools.build.lib.clock.BlazeClock;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.events.Reporter;
@@ -468,8 +469,7 @@
                   .getPackageFactoryBuilderForTesting()
                   .build(loadingMock.createRuleClassProvider(), fs),
               new BlazeDirectories(
-                  fs.getPath("/install"),
-                  fs.getPath("/output"),
+                  new ServerDirectories(fs.getPath("/install"), fs.getPath("/output")),
                   workspace,
                   loadingMock.getProductName()),
               null, /* BinTools */