diff options
| author |  Nathan Harmata <nharmata@google.com> | 2016-10-18 08:55:17 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2016-10-18 10:59:23 +0000 |
| commit | d4f75941a98e2ee9e5ae3f8e87d6c4aab3e5eb96 (patch) | |
| tree | 9c9b01908dd365f6e20ca34fe7fd81b929376c66 /src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java | |
| parent | 69c98ab99563e0542cd6146de22a397679c67fdb (diff) | |
Rollback of commit b776d6c12e952eb358c1a036cc9d93d8944c4c77.
*** Reason for rollback ***
--
MOS_MIGRATED_REVID=136448178
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 | 5 |
1 files changed, 4 insertions, 1 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 a00dd07a16..020934314f 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 @@ -30,6 +30,7 @@ import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.NullEventHandler; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; +import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction; import com.google.devtools.build.lib.skyframe.GlobValue.InvalidGlobPatternException; import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy; import com.google.devtools.build.lib.testutil.ManualClock; @@ -123,7 +124,9 @@ public abstract class GlobFunctionTest { AtomicReference<ImmutableSet<PackageIdentifier>> deletedPackages = new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()); ExternalFilesHelper externalFilesHelper = new ExternalFilesHelper( - pkgLocator, false, new BlazeDirectories(root, root, root, TestConstants.PRODUCT_NAME)); + pkgLocator, + ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, + new BlazeDirectories(root, root, root, TestConstants.PRODUCT_NAME)); Map<SkyFunctionName, SkyFunction> skyFunctions = new HashMap<>(); skyFunctions.put(SkyFunctions.GLOB, new GlobFunction(alwaysUseDirListing())); |