Move workspace initialization out of BlazeRuntime.Builder.

Require all callers to call initWorkspace after BlazeRuntime construction.

--
MOS_MIGRATED_REVID=129842292

1 files changed, 4 insertions, 3 deletions

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 eff79d93bf..2b550ea2a1 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
@@ -131,13 +131,10 @@ public class BlazeCommandDispatcherRcoptionsTest {
     String productName = TestConstants.PRODUCT_NAME;
     ServerDirectories serverDirectories =
         new ServerDirectories(scratch.dir("install_base"), scratch.dir("output_base"));
-    BlazeDirectories directories =
-        new BlazeDirectories(serverDirectories, scratch.dir("pkg"), productName);
     this.runtime =
         new BlazeRuntime.Builder()
             .setProductName(productName)
             .setServerDirectories(serverDirectories)
-            .setDirectories(directories)
             .setStartupOptionsProvider(
                 OptionsParser.newOptionsParser(BlazeServerStartupOptions.class))
             .addBlazeModule(
@@ -155,6 +152,10 @@ public class BlazeCommandDispatcherRcoptionsTest {
                   }
                 })
             .build();
+
+    BlazeDirectories directories =
+        new BlazeDirectories(serverDirectories, scratch.dir("pkg"), productName);
+    this.runtime.initWorkspace(directories, /*binTools=*/null);
   }
 
   @Test