diff options
author | 2017-09-14 09:55:40 +0200 | |
---|---|---|
committer | 2017-09-14 18:47:27 +0200 | |
commit | 3b63a4e67c547a656000dfd4e9d61f68a21b92d8 (patch) | |
tree | fa84bb33fd9741aa5a59de627909e0f5dd984e5f /src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java | |
parent | aa437e01b1879f0e1ba0452ce6137d80586258da (diff) |
Remove deepExecRoot from BlazeDirectories. It is now the default. Also inline constructor that did ServerDirectories creation inline: don't pollute production code for tests' convenience.
PiperOrigin-RevId: 168652349
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 103211f76e..2daf071529 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 @@ -30,6 +30,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.testing.EqualsTester; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.PackageIdentifier; @@ -121,7 +122,8 @@ public class FileFunctionTest { private SequentialBuildDriver makeDriver(ExternalFileAction externalFileAction) { AtomicReference<PathPackageLocator> pkgLocatorRef = new AtomicReference<>(pkgLocator); BlazeDirectories directories = - new BlazeDirectories(pkgRoot, outputBase, pkgRoot, TestConstants.PRODUCT_NAME); + new BlazeDirectories( + new ServerDirectories(pkgRoot, outputBase), pkgRoot, TestConstants.PRODUCT_NAME); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper(pkgLocatorRef, externalFileAction, directories); differencer = new RecordingDifferencer(); |