Use the local JDK as the default target javabase and continue to use the embedded JDK as the default host_javabase. PiperOrigin-RevId: 196471714
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java index 36024e5..bc89c9a 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/BlazeDirectoriesTest.java
@@ -37,20 +37,29 @@ Path workspace = fs.getPath("/my/ws"); BlazeDirectories directories = new BlazeDirectories( - new ServerDirectories(installBase, outputBase, userRoot), workspace, "foo"); + new ServerDirectories(installBase, outputBase, userRoot), + workspace, + /* defaultSystemJavabase= */ null, + "foo"); assertThat(outputBase.getRelative("execroot/ws")).isEqualTo(directories.getExecRoot()); workspace = null; directories = new BlazeDirectories( - new ServerDirectories(installBase, outputBase, userRoot), workspace, "foo"); + new ServerDirectories(installBase, outputBase, userRoot), + workspace, + /* defaultSystemJavabase= */ null, + "foo"); assertThat(outputBase.getRelative("execroot/" + BlazeDirectories.DEFAULT_EXEC_ROOT)) .isEqualTo(directories.getExecRoot()); workspace = fs.getPath("/"); directories = new BlazeDirectories( - new ServerDirectories(installBase, outputBase, userRoot), workspace, "foo"); + new ServerDirectories(installBase, outputBase, userRoot), + workspace, + /* defaultSystemJavabase= */ null, + "foo"); assertThat(outputBase.getRelative("execroot/" + BlazeDirectories.DEFAULT_EXEC_ROOT)) .isEqualTo(directories.getExecRoot()); } @@ -64,6 +73,7 @@ FsUtils.TEST_FILESYSTEM.getPath("/output_base"), FsUtils.TEST_FILESYSTEM.getPath("/user_root")), FsUtils.TEST_FILESYSTEM.getPath("/workspace"), + /* defaultSystemJavabase= */ null, "Blaze"), new BlazeDirectories( new ServerDirectories( @@ -72,6 +82,7 @@ FsUtils.TEST_FILESYSTEM.getPath("/user_root"), "1234abcd1234abcd1234abcd1234abcd"), FsUtils.TEST_FILESYSTEM.getPath("/workspace"), + /* defaultSystemJavabase= */ null, "Blaze"), new BlazeDirectories( new ServerDirectories( @@ -79,6 +90,7 @@ FsUtils.TEST_FILESYSTEM.getPath("/output_base"), FsUtils.TEST_FILESYSTEM.getPath("/user_root")), FsUtils.TEST_FILESYSTEM.getPath("/workspace"), + /* defaultSystemJavabase= */ null, "Bazel")) .addDependency(FileSystem.class, FsUtils.TEST_FILESYSTEM) .runTests();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java index 81dc77b..40b7c04 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
@@ -77,6 +77,7 @@ scratch.resolve("/base"), scratch.resolve("/userRoot")), scratch.resolve("/workspace"), + /* defaultSystemJavabase= */ null, "mock-product-name"); binTools = BinTools.empty(directories); }
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java index 346569c..1880c29 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -157,6 +157,7 @@ new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, analysisMock.getProductName()); workspaceStatusActionFactory = new AnalysisTestUtil.DummyWorkspaceStatusActionFactory(directories);
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index b917b32..6cb707f 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -221,6 +221,7 @@ new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, analysisMock.getProductName()); actionKeyContext = new ActionKeyContext(); mockToolsConfig = new MockToolsConfig(rootDirectory, false);
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java index e1c054d..1c314f4 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -107,6 +107,7 @@ new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, analysisMock.getProductName()); pkgFactory = analysisMock
diff --git a/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java b/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java index ec724b2..1dcd3b0 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java
@@ -55,6 +55,7 @@ fileSystem.getPath("/base"), fileSystem.getPath("/root")), fileSystem.getPath("/workspace"), + /* defaultSystemJavabase= */ null, "mock-product-name"); binTools = BinTools.empty(directories); }
diff --git a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java index 712695e..60d6df6 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java +++ b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
@@ -65,7 +65,8 @@ Mutability.create("test"), allowOverride, root, - root); + root, + /* defaultSystemJavabaseDir= */ null); Exception exception = null; try { byte[] bytes =
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java index 5503935..58107d0 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
@@ -95,6 +95,7 @@ new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, loadingMock.getProductName()); packageFactory = loadingMock
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java index b199ffa..2890619 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
@@ -78,6 +78,7 @@ new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, analysisMock.getProductName()); skyframeExecutor = SequencedSkyframeExecutor.create(
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 81da772..32aacda 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
@@ -471,6 +471,7 @@ new ServerDirectories( fs.getPath("/install"), fs.getPath("/output"), fs.getPath("/userRoot")), workspace, + /* defaultSystemJavabase= */ null, loadingMock.getProductName()); ConfiguredRuleClassProvider ruleClassProvider = loadingMock.createRuleClassProvider(); skyframeExecutor =
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java index 4e030ac..b4fa688 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -720,6 +720,7 @@ new ServerDirectories( fs.getPath("/install"), fs.getPath("/output"), fs.getPath("/userRoot")), workspace, + /* defaultSystemJavabase= */ null, analysisMock.getProductName()); FileSystemUtils.deleteTree(workspace.getRelative("base"));
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java index afdab94..e4729d3 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
@@ -86,6 +86,7 @@ new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, analysisMock.getProductName()); PackageFactory.BuilderForTesting packageFactoryBuilder = analysisMock.getPackageFactoryBuilderForTesting(directories);
diff --git a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java index 7b3cbd5..4655acc 100644 --- a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java +++ b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
@@ -94,6 +94,7 @@ new BlazeDirectories( new ServerDirectories(rootDirectory, outputBase, rootDirectory), rootDirectory, + /* defaultSystemJavabase= */ null, analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = ExternalFilesHelper.createForTesting(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java index d49ddc2..78f2d01 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
@@ -76,7 +76,10 @@ Path root = scratch.dir("/outputbase"); BlazeDirectories directories = new BlazeDirectories( - new ServerDirectories(root, root, root), root, TestConstants.PRODUCT_NAME); + new ServerDirectories(root, root, root), + root, + /* defaultSystemJavabase= */ null, + TestConstants.PRODUCT_NAME); delegatorFunction = new RepositoryDelegatorFunction( ImmutableMap.of(), null, new AtomicBoolean(true), ImmutableMap::of, directories);
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 3582a2d..9e1b08a 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
@@ -168,7 +168,8 @@ .build(); BlazeDirectories directories = - new BlazeDirectories(serverDirectories, scratch.dir("pkg"), productName); + new BlazeDirectories( + serverDirectories, scratch.dir("pkg"), /* defaultSystemJavabase= */ null, productName); this.runtime.initWorkspace(directories, /*binTools=*/null); }
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BlazeOptionHandlerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BlazeOptionHandlerTest.java index d9454bc..33b8acb 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/BlazeOptionHandlerTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/BlazeOptionHandlerTest.java
@@ -78,7 +78,11 @@ this.runtime.overrideCommands(ImmutableList.of(new C0Command())); BlazeDirectories directories = - new BlazeDirectories(serverDirectories, scratch.dir("workspace"), productName); + new BlazeDirectories( + serverDirectories, + scratch.dir("workspace"), + /* defaultSystemJavabase= */ null, + productName); runtime.initWorkspace(directories, /*binTools=*/ null); }
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 3d52a3d..0235a3a 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
@@ -646,6 +646,7 @@ new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, "productName"), /* fragmentsMap= */ ImmutableMap .<Class<? extends BuildConfiguration.Fragment>, BuildConfiguration.Fragment>of(),
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java b/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java index 71948da..80fc134 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java
@@ -381,7 +381,11 @@ snooze = new WaitForCompletionCommand(isTestShuttingDown); dispatcher = new BlazeCommandDispatcher(runtime, snooze); BlazeDirectories blazeDirectories = - new BlazeDirectories(serverDirectories, scratch.dir("workspace"), productName); + new BlazeDirectories( + serverDirectories, + scratch.dir("workspace"), + /* defaultSystemJavabase= */ null, + productName); runtime.initWorkspace(blazeDirectories, /* binTools= */ null); }
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/commands/CleanCommandRecommendsAsyncTest.java b/src/test/java/com/google/devtools/build/lib/runtime/commands/CleanCommandRecommendsAsyncTest.java index d2235c8..6f6ff5d 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/commands/CleanCommandRecommendsAsyncTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/commands/CleanCommandRecommendsAsyncTest.java
@@ -110,7 +110,11 @@ }) .build(); BlazeDirectories directories = - new BlazeDirectories(serverDirectories, scratch.dir("workspace"), productName); + new BlazeDirectories( + serverDirectories, + scratch.dir("workspace"), + /* defaultSystemJavabase= */ null, + productName); runtime.initWorkspace(directories, /* binTools= */ null); BlazeCommandDispatcher dispatcher = new BlazeCommandDispatcher(runtime, new CleanCommand(os));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java index 84b2cd9..c0c2d73 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java
@@ -78,7 +78,10 @@ BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY)); BlazeDirectories directories = new BlazeDirectories( - new ServerDirectories(root, root, root), root, TestConstants.PRODUCT_NAME); + new ServerDirectories(root, root, root), + root, + /* defaultSystemJavabase= */ null, + TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = ExternalFilesHelper.createForTesting( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS,
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java index 7982b2d..100b086 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
@@ -85,6 +85,7 @@ new BlazeDirectories( new ServerDirectories(rootDirectory, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = ExternalFilesHelper.createForTesting(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java index 3ddda58..926d63b 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
@@ -131,6 +131,7 @@ new BlazeDirectories( new ServerDirectories(pkgRoot.asPath(), outputBase, outputBase), pkgRoot.asPath(), + /* defaultSystemJavabase= */ null, TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = ExternalFilesHelper.createForTesting(pkgLocatorRef, externalFileAction, directories);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java index bd1a1a0..02088a9 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
@@ -96,6 +96,7 @@ new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, TestConstants.PRODUCT_NAME)); Map<SkyFunctionName, SkyFunction> skyFunctions = new HashMap<>();
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java index 2616923..f0112d4 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
@@ -111,7 +111,10 @@ BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY)); BlazeDirectories directories = new BlazeDirectories( - new ServerDirectories(pkgRoot, pkgRoot, pkgRoot), pkgRoot, TestConstants.PRODUCT_NAME); + new ServerDirectories(pkgRoot, pkgRoot, pkgRoot), + pkgRoot, + /* defaultSystemJavabase= */ null, + TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = ExternalFilesHelper.createForTesting( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, directories); skyFunctions.put(SkyFunctions.FILE_STATE, new FileStateFunction(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java index f690e65..167672a 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
@@ -133,7 +133,10 @@ new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()); BlazeDirectories directories = new BlazeDirectories( - new ServerDirectories(root, root, root), root, TestConstants.PRODUCT_NAME); + new ServerDirectories(root, root, root), + root, + /* defaultSystemJavabase= */ null, + TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = ExternalFilesHelper.createForTesting( pkgLocator,
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java index be292bd..3e457ba 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
@@ -77,6 +77,7 @@ new BlazeDirectories( new ServerDirectories(rootDirectory, outputBase, rootDirectory), rootDirectory, + /* defaultSystemJavabase= */ null, analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = ExternalFilesHelper.createForTesting( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, directories);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java index 978da79..195d987 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -102,6 +102,7 @@ new BlazeDirectories( new ServerDirectories(rootDirectory, outputBase, rootDirectory), rootDirectory, + /* defaultSystemJavabase= */ null, analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = ExternalFilesHelper.createForTesting( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, directories);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java index b307d09..85decff 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
@@ -74,6 +74,7 @@ getScratch().dir("/output"), getScratch().dir("/user_root")), rootDirectory, + /* defaultSystemJavabase= */ null, AnalysisMock.get().getProductName()); ConfiguredRuleClassProvider ruleClassProvider = AnalysisMock.get().createRuleClassProvider(); skyframeExecutor =
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java index 8ea4fd0..7dc9f95 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
@@ -105,6 +105,7 @@ new BlazeDirectories( new ServerDirectories(rootDirectory, outputBase, rootDirectory), rootDirectory, + null, analysisMock.getProductName()); ExternalFilesHelper externalFilesHelper = ExternalFilesHelper.createForTesting( pkgLocator, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, directories);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index e80ec31..56ada85 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
@@ -175,6 +175,7 @@ new BlazeDirectories( new ServerDirectories(rootDirectory, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = ExternalFilesHelper.createForTesting( pkgLocator,
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 5ef553f..d4ecd6c 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
@@ -112,6 +112,7 @@ new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), workspaceDir, + /* defaultSystemJavabase= */ null, "mock-product-name"); // This call implicitly symlinks the integration bin tools into the exec root. IntegrationMock.get()