diff options
| author |  cushon <cushon@google.com> | 2018-05-14 01:51:45 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-14 01:53:21 -0700 |
| commit | 849df36c5ad31ebe8791c4228321c38c6d0ae56c (patch) | |
| tree | cc39afc4e667214b4aac69217fb697166c96ddd4 /src/test/java/com/google/devtools/build/lib/pkgcache | |
| parent | 5c3f5c9be7fa40d4fb3c35756891fab8483ca406 (diff) | |
Use the local JDK as the default target javabase
and continue to use the embedded JDK as the default host_javabase.
PiperOrigin-RevId: 196471714
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/pkgcache')
4 files changed, 4 insertions, 0 deletions
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); |