From 3b63a4e67c547a656000dfd4e9d61f68a21b92d8 Mon Sep 17 00:00:00 2001 From: janakr Date: Thu, 14 Sep 2017 09:55:40 +0200 Subject: 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 --- .../devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/test/java/com/google/devtools/build/lib/standalone') diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java index 0ca75c3931..46616f6131 100644 --- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java +++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java @@ -34,6 +34,7 @@ import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnActionContext; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; 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.events.PrintingEventHandler; import com.google.devtools.build.lib.events.Reporter; @@ -106,7 +107,8 @@ public class StandaloneSpawnStrategyTest { outputBase.createDirectory(); BlazeDirectories directories = - new BlazeDirectories(outputBase, outputBase, workspaceDir, "mock-product-name"); + new BlazeDirectories( + new ServerDirectories(outputBase, outputBase), workspaceDir, "mock-product-name"); // This call implicitly symlinks the integration bin tools into the exec root. IntegrationMock.get().getIntegrationBinTools(directories, TestConstants.WORKSPACE_NAME); OptionsParser optionsParser = OptionsParser.newOptionsParser(ExecutionOptions.class); -- cgit v1.2.3