diff options
3 files changed, 26 insertions, 22 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java index 04ab650e2e..869343ab8b 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java @@ -67,7 +67,7 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { private static final int GLOBBING_THREADS = 7; protected ConfiguredRuleClassProvider ruleClassProvider; - private SkyframeExecutor skyframeExecutor; + protected SkyframeExecutor skyframeExecutor; @Before public final void initializeSkyframeExecutor() throws Exception { diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java index 7c7fc4b953..d8c63fe050 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java @@ -405,15 +405,17 @@ public class SkyframeLabelVisitorTest extends SkyframeLabelVisitorTestCase { public void testWithNoSubincludes() throws Exception { // This test uses the preprocessor. preprocessorFactorySupplier.inject( - new SubincludePreprocessor(scratch.getFileSystem(), skyframeExecutor.getPackageManager())); - skyframeExecutor.preparePackageLoading( - new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), - ConstantRuleVisibility.PRIVATE, - true, - 7, - ruleClassProvider.getDefaultsPackageContent(), - UUID.randomUUID()); - this.visitor = skyframeExecutor.pkgLoader(); + new SubincludePreprocessor( + scratch.getFileSystem(), getSkyframeExecutor().getPackageManager())); + getSkyframeExecutor() + .preparePackageLoading( + new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), + ConstantRuleVisibility.PRIVATE, + true, + 7, + ruleClassProvider.getDefaultsPackageContent(), + UUID.randomUUID()); + this.visitor = getSkyframeExecutor().pkgLoader(); scratch.file("pkg/BUILD", "sh_library(name = 'x', deps = ['z'])", "sh_library(name = 'z')"); assertLabelsVisited( ImmutableSet.of("//pkg:x", "//pkg:z"), @@ -446,15 +448,17 @@ public class SkyframeLabelVisitorTest extends SkyframeLabelVisitorTestCase { public void testSubpackageBoundarySubincludes() throws Exception { // This test uses the python preprocessor. preprocessorFactorySupplier.inject( - new SubincludePreprocessor(scratch.getFileSystem(), skyframeExecutor.getPackageManager())); - skyframeExecutor.preparePackageLoading( - new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), - ConstantRuleVisibility.PRIVATE, - true, - 7, - ruleClassProvider.getDefaultsPackageContent(), - UUID.randomUUID()); - this.visitor = skyframeExecutor.pkgLoader(); + new SubincludePreprocessor( + scratch.getFileSystem(), getSkyframeExecutor().getPackageManager())); + getSkyframeExecutor() + .preparePackageLoading( + new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), + ConstantRuleVisibility.PRIVATE, + true, + 7, + ruleClassProvider.getDefaultsPackageContent(), + UUID.randomUUID()); + this.visitor = getSkyframeExecutor().pkgLoader(); scratch.file("a/BUILD", "subinclude('//b:c/d/foo')"); scratch.file("b/BUILD", "exports_files(['c/d/foo'])"); scratch.file("b/c/d/foo", "sh_library(name = 'a')"); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java index ab1cc035fe..37831b954c 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTestCase.java @@ -59,7 +59,6 @@ abstract public class SkyframeLabelVisitorTestCase extends PackageLoadingTestCas protected static final boolean EXPECT_ERROR = true; protected TransitivePackageLoader visitor = null; protected CustomInMemoryFs fs = new CustomInMemoryFs(new ManualClock()); - protected SkyframeExecutor skyframeExecutor; protected PreprocessorUtils.MutableFactorySupplier preprocessorFactorySupplier = new PreprocessorUtils.MutableFactorySupplier(null); @@ -192,7 +191,8 @@ abstract public class SkyframeLabelVisitorTestCase extends PackageLoadingTestCas } protected void syncPackages(ModifiedFileSet modifiedFileSet) throws InterruptedException { - skyframeExecutor.invalidateFilesUnderPathForTesting(reporter, modifiedFileSet, rootDirectory); + getSkyframeExecutor() + .invalidateFilesUnderPathForTesting(reporter, modifiedFileSet, rootDirectory); } @Override @@ -201,7 +201,7 @@ abstract public class SkyframeLabelVisitorTestCase extends PackageLoadingTestCas Set<Target> targets = new HashSet<>(); for (String strLabel : strLabels) { Label label = Label.parseAbsolute(strLabel); - targets.add(skyframeExecutor.getPackageManager().getTarget(reporter, label)); + targets.add(getSkyframeExecutor().getPackageManager().getTarget(reporter, label)); } return targets; } |