Remove the unused BlacklistedPackagePrefixesFunction#hardcodedBlacklistedPackagePrefixes.
RELNOTES: None
PiperOrigin-RevId: 288756249
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
index 51e3a53..b728e74 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -85,7 +85,7 @@
private SequentialBuildDriver driver;
private RecordingDifferencer differencer;
private Path emptyPackagePath;
- private static final String ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING =
+ private static final String BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING =
"config/blacklisted.txt";
protected abstract CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy();
@@ -134,10 +134,10 @@
SkyFunctions.DIRECTORY_LISTING_STATE,
new DirectoryListingStateFunction(
externalFilesHelper, new AtomicReference<>(UnixGlob.DEFAULT_SYSCALLS)));
- skyFunctions.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
+ skyFunctions.put(
+ SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
new BlacklistedPackagePrefixesFunction(
- /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(),
- PathFragment.create(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING)));
+ PathFragment.create(BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING)));
RuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider();
skyFunctions.put(SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(ruleClassProvider));
skyFunctions.put(
@@ -237,8 +237,8 @@
public void testBlacklistedPackage() throws Exception {
scratch.file("blacklisted/subdir/BUILD");
scratch.file("blacklisted/BUILD");
- Path blacklist = scratch.overwriteFile(
- ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "blacklisted");
+ Path blacklist =
+ scratch.overwriteFile(BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "blacklisted");
ImmutableSet<String> pkgs = ImmutableSet.of("blacklisted/subdir", "blacklisted");
for (String pkg : pkgs) {
@@ -248,8 +248,7 @@
assertThat(packageLookupValue.getErrorMsg()).isNotNull();
}
- scratch.overwriteFile(
- ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "not_blacklisted");
+ scratch.overwriteFile(BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "not_blacklisted");
RootedPath rootedBlacklist =
RootedPath.toRootedPath(
Root.fromPath(blacklist.getParentDirectory().getParentDirectory()),