Move NestedSet toListInterruptibly to a separate class supporting callbacks.
CppCompileAction adds information to the log for long NestedSet expansion.
Remove the logging logic and use the new class to expand the modules NestedSet.
PiperOrigin-RevId: 299254214
diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
index f655b68..79de9aa 100644
--- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
@@ -40,6 +40,7 @@
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.ServerDirectories;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
+import com.google.devtools.build.lib.collect.nestedset.NestedSetExpander;
import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.events.PrintingEventHandler;
import com.google.devtools.build.lib.events.Reporter;
@@ -207,7 +208,8 @@
/*topLevelFilesets=*/ ImmutableMap.of(),
SIMPLE_ARTIFACT_EXPANDER,
/*actionFileSystem=*/ null,
- /*skyframeDepsResult=*/ null);
+ /*skyframeDepsResult=*/ null,
+ NestedSetExpander.NO_CALLBACKS);
}
@Test
