diff options
| author |  tomlu <tomlu@google.com> | 2017-10-27 12:12:11 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-10-30 10:40:06 -0400 |
| commit | f903eb5ace7e4d9e72ca95f3e5fa39816be93a76 (patch) | |
| tree | 3f5f33de008ecd0c82996a134fad2968146312e3 /src/test/java/com/google/devtools/build/lib/pkgcache | |
| parent | 4abd9434447e08c70266cc5583456816537718c3 (diff) | |
Thread FileSystem through to a single Path#delete call site.
This requires a fairly large amount of changes to fundamental objects like BlazeRuntime, Executor, and so on, as well as changing a lot of test code to thread the file system through. I expect future CLs to be much smaller.
PiperOrigin-RevId: 173678144
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/pkgcache')
4 files changed, 5 insertions, 1 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 49cffe23d3..fbdf45e2ac 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 @@ -82,6 +82,7 @@ public class BuildFileModificationTest extends FoundationTestCase { analysisMock .getPackageFactoryBuilderForTesting(directories) .build(ruleClassProvider, scratch.getFileSystem()), + fileSystem, directories, null, /* workspaceStatusActionFactory */ ruleClassProvider.getBuildInfoFactories(), 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 7e297b6c5d..9e4fdf97ee 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 @@ -473,6 +473,7 @@ public class IncrementalLoadingTest { loadingMock .getPackageFactoryBuilderForTesting(directories) .build(loadingMock.createRuleClassProvider(), fs), + fs, directories, null, /* workspaceStatusActionFactory */ loadingMock.createRuleClassProvider().getBuildInfoFactories(), 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 362d632ad2..6618d01834 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 @@ -621,6 +621,7 @@ public class LoadingPhaseRunnerTest { skyframeExecutor = SequencedSkyframeExecutor.create( pkgFactory, + fs, directories, null, /* workspaceStatusActionFactory -- not used */ ruleClassProvider.getBuildInfoFactories(), 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 eff26b0e35..1d26d0107f 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 @@ -90,7 +90,8 @@ public class PackageCacheTest extends FoundationTestCase { } skyframeExecutor = SequencedSkyframeExecutor.create( - packageFactoryBuilder.build(ruleClassProvider, scratch.getFileSystem()), + packageFactoryBuilder.build(ruleClassProvider, fileSystem), + fileSystem, directories, null, /* workspaceStatusActionFactory */ ruleClassProvider.getBuildInfoFactories(), |