commit 298da7bcd0cfe7e11922746d9b8eefe2ab68ced5
author Googler <lberki@google.com> Tue Oct 15 05:18:43 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Oct 15 05:19:59 2024 -0700
tree 52f408644952bc7f500d8f70409629afb22f60b8
parent 73f7d23a7a6a21ea285fc62086729a7f065e86fe

Push the IgnoredSubdirectories abstraction a little further, everywhere other than diff awareness.

Progress towards #9037.

RELNOTES: None.
PiperOrigin-RevId: 686063047
Change-Id: If27b64213ed51f0b5f8c361c657b9bba2d7511f6

src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java b/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java
index 0469085..f5ef624 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.devtools.build.lib.actions.ThreadStateReceiver;
+import com.google.devtools.build.lib.cmdline.IgnoredSubdirectories;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.packages.Globber.BadGlobException;
 import com.google.devtools.build.lib.testutil.Scratch;
@@ -109,7 +110,7 @@
         new GlobCache(
             packageDirectory,
             PackageIdentifier.createInMainRepo("isolated"),
-            ImmutableSet.copyOf(ignoredDirectories),
+            IgnoredSubdirectories.of(ImmutableSet.copyOf(ignoredDirectories)),
             new CachingPackageLocator() {
               @Override
               public Path getBuildFileForPackage(PackageIdentifier packageId) {

src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
index 42de75e..e0e33c6 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
@@ -20,11 +20,11 @@
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.actions.ThreadStateReceiver;
 import com.google.devtools.build.lib.analysis.config.FeatureSet;
+import com.google.devtools.build.lib.cmdline.IgnoredSubdirectories;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
@@ -1880,7 +1880,7 @@
           new GlobCache(
               pkg.getFilename().asPath().getParentDirectory(),
               pkg.getPackageIdentifier(),
-              ImmutableSet.of(),
+              IgnoredSubdirectories.EMPTY,
               // a package locator that finds no packages
               new CachingPackageLocator() {
                 @Override