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/runtime/BuildEventStreamerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
index 5e6116a..2c5a263 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
@@ -29,6 +29,7 @@
 import com.google.devtools.build.lib.actions.EventReportingArtifacts;
 import com.google.devtools.build.lib.actions.Root;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
+import com.google.devtools.build.lib.analysis.ServerDirectories;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
@@ -613,11 +614,13 @@
             ImmutableSet.<BuildEventId>of(ProgressEvent.INITIAL_PROGRESS_UPDATE));
     BuildConfiguration configuration =
         new BuildConfiguration(
-            new BlazeDirectories(outputBase, outputBase, rootDirectory, "productName"),
-            ImmutableMap.<Class<? extends BuildConfiguration.Fragment>,
-                          BuildConfiguration.Fragment>of(),
-            BuildOptions.of(ImmutableList.<Class<? extends FragmentOptions>>of(
-              BuildConfiguration.Options.class)),
+            new BlazeDirectories(
+                new ServerDirectories(outputBase, outputBase), rootDirectory, "productName"),
+            ImmutableMap
+                .<Class<? extends BuildConfiguration.Fragment>, BuildConfiguration.Fragment>of(),
+            BuildOptions.of(
+                ImmutableList.<Class<? extends FragmentOptions>>of(
+                    BuildConfiguration.Options.class)),
             "workspace");
     BuildEvent firstWithConfiguration =
         new GenericConfigurationEvent(testId("first"), configuration);