diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2018-02-27 05:47:21 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-27 05:48:54 -0800 |
| commit | c2499c406d0727853ea0ddc5372a50be95de5515 (patch) | |
| tree | 16a06cfd31ae66c6a32155071b8dfc3d8a8b090d /src/test/java/com/google/devtools/build/lib/pkgcache | |
| parent | 4c763e8ff61884952953b7bca8793796f282cdc0 (diff) | |
Expose --output_user_base to the Bazel server process
...so that it can use that path to compute other directories in the
output user base, in particular the default location for caches.
The first cache we will add is the hash-index cache for downloads
of external archives, but a spawn cache might be added later in the
output user base as well.
Change-Id: I24b1c33235c8f76ec008ecb1789163de2b2a45be
PiperOrigin-RevId: 187164275
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/pkgcache')
4 files changed, 6 insertions, 4 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 aaf0c5f9b3..1f3354e8ce 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 @@ -75,7 +75,7 @@ public class BuildFileModificationTest extends FoundationTestCase { ruleClassProvider = analysisMock.createRuleClassProvider(); BlazeDirectories directories = new BlazeDirectories( - new ServerDirectories(outputBase, outputBase), + new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, analysisMock.getProductName()); skyframeExecutor = 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 d4373b4f5e..569230190c 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 @@ -466,7 +466,8 @@ public class IncrementalLoadingTest { LoadingMock loadingMock = LoadingMock.get(); BlazeDirectories directories = new BlazeDirectories( - new ServerDirectories(fs.getPath("/install"), fs.getPath("/output")), + new ServerDirectories( + fs.getPath("/install"), fs.getPath("/output"), fs.getPath("/userRoot")), workspace, loadingMock.getProductName()); 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 6814b89f4a..cf7c61bba0 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 @@ -661,7 +661,8 @@ public class LoadingPhaseRunnerTest { analysisMock.setupMockClient(mockToolsConfig); directories = new BlazeDirectories( - new ServerDirectories(fs.getPath("/install"), fs.getPath("/output")), + new ServerDirectories( + fs.getPath("/install"), fs.getPath("/output"), fs.getPath("/userRoot")), workspace, 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 9134e4df79..b934efe85e 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 @@ -81,7 +81,7 @@ public class PackageCacheTest extends FoundationTestCase { ruleClassProvider = analysisMock.createRuleClassProvider(); BlazeDirectories directories = new BlazeDirectories( - new ServerDirectories(outputBase, outputBase), + new ServerDirectories(outputBase, outputBase, outputBase), rootDirectory, analysisMock.getProductName()); PackageFactory.BuilderForTesting packageFactoryBuilder = |