From 849df36c5ad31ebe8791c4228321c38c6d0ae56c Mon Sep 17 00:00:00 2001 From: cushon Date: Mon, 14 May 2018 01:51:45 -0700 Subject: Use the local JDK as the default target javabase and continue to use the embedded JDK as the default host_javabase. PiperOrigin-RevId: 196471714 --- .../build/lib/analysis/BlazeDirectoriesTest.java | 18 +++++++++++++++--- .../analysis/actions/TemplateExpansionActionTest.java | 1 + .../build/lib/analysis/util/AnalysisTestCase.java | 1 + .../build/lib/analysis/util/BuildViewTestCase.java | 1 + .../build/lib/analysis/util/ConfigurationTestCase.java | 1 + .../devtools/build/lib/exec/BlazeExecutorTest.java | 1 + .../build/lib/packages/WorkspaceFactoryTestHelper.java | 3 ++- .../lib/packages/util/PackageLoadingTestCase.java | 1 + .../build/lib/pkgcache/BuildFileModificationTest.java | 1 + .../build/lib/pkgcache/IncrementalLoadingTest.java | 1 + .../build/lib/pkgcache/LoadingPhaseRunnerTest.java | 1 + .../devtools/build/lib/pkgcache/PackageCacheTest.java | 1 + .../build/lib/repository/ExternalPackageUtilTest.java | 1 + .../lib/rules/repository/RepositoryDelegatorTest.java | 5 ++++- .../runtime/BlazeCommandDispatcherRcoptionsTest.java | 3 ++- .../build/lib/runtime/BlazeOptionHandlerTest.java | 6 +++++- .../build/lib/runtime/BuildEventStreamerTest.java | 1 + .../build/lib/runtime/CommandInterruptionTest.java | 6 +++++- .../commands/CleanCommandRecommendsAsyncTest.java | 6 +++++- .../build/lib/skyframe/ArtifactFunctionTestCase.java | 5 ++++- .../skyframe/ContainingPackageLookupFunctionTest.java | 1 + .../devtools/build/lib/skyframe/FileFunctionTest.java | 1 + .../build/lib/skyframe/FilesetEntryFunctionTest.java | 1 + .../build/lib/skyframe/FilesystemValueCheckerTest.java | 5 ++++- .../devtools/build/lib/skyframe/GlobFunctionTest.java | 5 ++++- .../skyframe/LocalRepositoryLookupFunctionTest.java | 1 + .../build/lib/skyframe/PackageLookupFunctionTest.java | 1 + ...PrepareDepsOfPatternsFunctionSmartNegationTest.java | 1 + .../RecursiveFilesystemTraversalFunctionTest.java | 1 + .../build/lib/skyframe/TimestampBuilderTestCase.java | 1 + .../lib/standalone/StandaloneSpawnStrategyTest.java | 1 + src/test/shell/bazel/bazel_rules_test.sh | 2 +- 32 files changed, 72 insertions(+), 13 deletions(-) (limited to 'src/test') 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 36024e5695..bc89c9a62d 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 @@ public class BlazeDirectoriesTest extends FoundationTestCase { 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 @@ public class BlazeDirectoriesTest extends FoundationTestCase { 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 @@ public class BlazeDirectoriesTest extends FoundationTestCase { FsUtils.TEST_FILESYSTEM.getPath("/user_root"), "1234abcd1234abcd1234abcd1234abcd"), FsUtils.TEST_FILESYSTEM.getPath("/workspace"), + /* defaultSystemJavabase= */ null, "Blaze"), new BlazeDirectories( new ServerDirectories( @@ -79,6 +90,7 @@ public class BlazeDirectoriesTest extends FoundationTestCase { 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 81dc77b98b..40b7c049d8 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 @@ public class TemplateExpansionActionTest extends FoundationTestCase { 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 346569c88e..1880c29c9b 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 @@ public abstract class AnalysisTestCase extends FoundationTestCase { 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 b917b327aa..6cb707fd1a 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 @@ public abstract class BuildViewTestCase extends FoundationTestCase { 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 e1c054d089..1c314f4bbc 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 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { 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 ec724b2c0c..1dcd3b0e11 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 @@ public class BlazeExecutorTest { 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 712695ee61..60d6df6566 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 @@ class WorkspaceFactoryTestHelper { 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 5503935adf..58107d0b3a 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 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { 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 b199ffa2c5..2890619c2e 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 @@ public class BuildFileModificationTest extends FoundationTestCase { 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 81da77283f..32aacdaa9d 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 @@ public class IncrementalLoadingTest { 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 4e030acd7b..b4fa688e84 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 @@ public class LoadingPhaseRunnerTest { 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 afdab94a68..e4729d3516 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 @@ public class PackageCacheTest extends FoundationTestCase { 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 7b3cbd5cc0..4655acc06a 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 @@ public class ExternalPackageUtilTest extends BuildViewTestCase { 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 d49ddc288b..78f2d01952 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 @@ public class RepositoryDelegatorTest extends FoundationTestCase { 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 3582a2d87f..9e1b08ab03 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 @@ public class BlazeCommandDispatcherRcoptionsTest { .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 d9454bcbbd..33b8acb10c 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 @@ public class BlazeOptionHandlerTest { 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 3d52a3d216..0235a3aca6 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 @@ public class BuildEventStreamerTest extends FoundationTestCase { new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, "productName"), /* fragmentsMap= */ ImmutableMap ., 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 71948daa5f..80fc134bf1 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 @@ public final class CommandInterruptionTest { 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 d2235c8d7f..6f6ff5d665 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 @@ public class CleanCommandRecommendsAsyncTest { }) .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 84b2cd978d..c0c2d73559 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 @@ abstract class ArtifactFunctionTestCase { 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 7982b2d5d6..100b0868a5 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 @@ public class ContainingPackageLookupFunctionTest extends FoundationTestCase { 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 3ddda580a9..926d63b2ac 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 @@ public class FileFunctionTest { 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 bd1a1a0ba2..02088a9d7e 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 @@ public final class FilesetEntryFunctionTest extends FoundationTestCase { new BlazeDirectories( new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, + /* defaultSystemJavabase= */ null, TestConstants.PRODUCT_NAME)); Map 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 261692338a..f0112d4c9f 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 @@ public class FilesystemValueCheckerTest { 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 f690e65c14..167672a346 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 @@ public abstract class GlobFunctionTest { new AtomicReference<>(ImmutableSet.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 be292bdead..3e457ba8be 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 @@ public class LocalRepositoryLookupFunctionTest extends FoundationTestCase { 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 978da79435..195d987fca 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 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { 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 b307d09db3..85decff337 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 @@ public class PrepareDepsOfPatternsFunctionSmartNegationTest extends FoundationTe 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 8ea4fd03bc..7dc9f959ef 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 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe 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 e80ec3183b..56ada85c9e 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 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { 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 5ef553fb38..d4ecd6ceb9 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 @@ public class StandaloneSpawnStrategyTest { 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() diff --git a/src/test/shell/bazel/bazel_rules_test.sh b/src/test/shell/bazel/bazel_rules_test.sh index b7e204fb42..2f2cc73d95 100755 --- a/src/test/shell/bazel/bazel_rules_test.sh +++ b/src/test/shell/bazel/bazel_rules_test.sh @@ -323,7 +323,7 @@ function test_genrule_toolchain_dependency { genrule( name = "toolchain_check", outs = ["version"], - toolchains = ['@bazel_tools//tools/jdk:current_java_runtime'], + toolchains = ['@bazel_tools//tools/jdk:current_host_java_runtime'], cmd = "ls -al \$(JAVABASE) > \$@", ) EOF -- cgit v1.2.3