diff options
| author |  janakr <janakr@google.com> | 2017-09-14 09:55:40 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-09-14 18:47:27 +0200 |
| commit | 3b63a4e67c547a656000dfd4e9d61f68a21b92d8 (patch) | |
| tree | fa84bb33fd9741aa5a59de627909e0f5dd984e5f /src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.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/GlobFunctionTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java | 11 |
1 files changed, 7 insertions, 4 deletions
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 8c938ee699..bfa4e9d292 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 @@ -25,6 +25,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; 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.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.NullEventHandler; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; @@ -122,10 +123,12 @@ public abstract class GlobFunctionTest { private Map<SkyFunctionName, SkyFunction> createFunctionMap() { AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()); - ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( - pkgLocator, - ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, - new BlazeDirectories(root, root, root, TestConstants.PRODUCT_NAME)); + ExternalFilesHelper externalFilesHelper = + new ExternalFilesHelper( + pkgLocator, + ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, + new BlazeDirectories( + new ServerDirectories(root, root), root, TestConstants.PRODUCT_NAME)); Map<SkyFunctionName, SkyFunction> skyFunctions = new HashMap<>(); skyFunctions.put(SkyFunctions.GLOB, new GlobFunction(alwaysUseDirListing())); |