From 15a23b96750d423d1b403a45ae58804e88d0acfc Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Tue, 9 Aug 2016 11:46:00 +0000 Subject: Split BlazeDirectories into two classes. This is done in preparation for allowing multiple workspaces / commands in a single server. That requires changes to the module API, which currently hard-codes a 1:1 correspondence between workspaces and servers. Note how BlazeDirectories exists even when it runs outside a workspace. It's not ideal that the output base is in ServerDirectories, and the BlazeRuntime creation also still requires a BlazeDirectories instance. -- MOS_MIGRATED_REVID=129736613 --- .../build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/runtime') diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java index dad3d2de0e..eff79d93bf 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java @@ -24,6 +24,7 @@ import com.google.common.collect.Lists; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ConfigurationCollectionFactory; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; +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.FragmentOptions; import com.google.devtools.build.lib.cmdline.Label; @@ -128,13 +129,14 @@ public class BlazeCommandDispatcherRcoptionsTest { @Before public final void initializeRuntime() throws Exception { String productName = TestConstants.PRODUCT_NAME; + ServerDirectories serverDirectories = + new ServerDirectories(scratch.dir("install_base"), scratch.dir("output_base")); BlazeDirectories directories = - new BlazeDirectories( - scratch.dir("install_base"), scratch.dir("output_base"), scratch.dir("pkg"), - productName); + new BlazeDirectories(serverDirectories, scratch.dir("pkg"), productName); this.runtime = new BlazeRuntime.Builder() .setProductName(productName) + .setServerDirectories(serverDirectories) .setDirectories(directories) .setStartupOptionsProvider( OptionsParser.newOptionsParser(BlazeServerStartupOptions.class)) -- cgit v1.2.3