diff options
| author |  nharmata <nharmata@google.com> | 2017-11-28 09:58:02 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-28 10:00:10 -0800 |
| commit | d0f06a6e4b61adc39bf5e1cfbae39501a89dc8e3 (patch) | |
| tree | 54d92cd2766eef00cb06a8bf6572426385fedb71 /src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java | |
| parent | 5c7fc5b114b88e4737bf47ac6085789a190f0d45 (diff) | |
Automated rollback of commit b64119807b014d9f3b99fb8a02e22daf1a8299b6.
*** Reason for rollback ***
Tickles the shell integration test version of b/35042288
*** Original change description ***
Change BlacklistedPackagesPrefixesFunction to take a pair of a hardcoded set of directories and a file path containing more directories to blacklist. The current usage of PrecomputedValue#BLACKLISTED_PACKAGE_PREFIXES_FILE is overly general and is only meaningfully used by unit tests; in practice, the blacklist file path can never change over the lifetime of the Bazel server. Perform a minor simplifying refactor as a result of this.
RELNOTES: None.
PiperOrigin-RevId: 177176068
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java | 3 |
1 files changed, 1 insertions, 2 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 02090b9339..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 @@ -90,8 +90,7 @@ public class BuildFileModificationTest extends FoundationTestCase { Predicates.<PathFragment>alwaysFalse(), analysisMock.getSkyFunctions(directories), ImmutableList.<SkyValueDirtinessChecker>of(), - BazelSkyframeExecutorConstants.HARDCODED_BLACKLISTED_PACKAGE_PREFIXES, - BazelSkyframeExecutorConstants.ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE, + PathFragment.EMPTY_FRAGMENT, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); |