diff options
Diffstat (limited to 'src/test/java/com/google')
14 files changed, 101 insertions, 35 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java index 16c991b8ac..76a75f6f84 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java @@ -169,7 +169,8 @@ public abstract class AnalysisTestCase extends FoundationTestCase { input -> false, analysisMock.getSkyFunctions(directories), ImmutableList.of(), - PathFragment.EMPTY_FRAGMENT, + BazelSkyframeExecutorConstants.HARDCODED_BLACKLISTED_PACKAGE_PREFIXES, + BazelSkyframeExecutorConstants.ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 1a5b3dcf11..60facef827 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -240,7 +240,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { Predicates.<PathFragment>alwaysFalse(), analysisMock.getSkyFunctions(directories), ImmutableList.<SkyValueDirtinessChecker>of(), - PathFragment.EMPTY_FRAGMENT, + BazelSkyframeExecutorConstants.HARDCODED_BLACKLISTED_PACKAGE_PREFIXES, + BazelSkyframeExecutorConstants.ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java index 57db7b0237..e7b5611479 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java @@ -122,7 +122,8 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { Predicates.<PathFragment>alwaysFalse(), analysisMock.getSkyFunctions(directories), ImmutableList.<SkyValueDirtinessChecker>of(), - PathFragment.EMPTY_FRAGMENT, + BazelSkyframeExecutorConstants.HARDCODED_BLACKLISTED_PACKAGE_PREFIXES, + BazelSkyframeExecutorConstants.ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); 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 5a9d3f6ddd..2bb00a95b8 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 @@ -120,7 +120,8 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { Predicates.<PathFragment>alwaysFalse(), ImmutableMap.<SkyFunctionName, SkyFunction>of(), ImmutableList.<SkyValueDirtinessChecker>of(), - PathFragment.EMPTY_FRAGMENT, + BazelSkyframeExecutorConstants.HARDCODED_BLACKLISTED_PACKAGE_PREFIXES, + BazelSkyframeExecutorConstants.ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); 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 fbdf45e2ac..02090b9339 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,7 +90,8 @@ public class BuildFileModificationTest extends FoundationTestCase { Predicates.<PathFragment>alwaysFalse(), analysisMock.getSkyFunctions(directories), ImmutableList.<SkyValueDirtinessChecker>of(), - PathFragment.EMPTY_FRAGMENT, + BazelSkyframeExecutorConstants.HARDCODED_BLACKLISTED_PACKAGE_PREFIXES, + BazelSkyframeExecutorConstants.ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java index 2c4b00f2d7..85562800ae 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java @@ -481,7 +481,8 @@ public class IncrementalLoadingTest { Predicates.<PathFragment>alwaysFalse(), ImmutableMap.<SkyFunctionName, SkyFunction>of(), ImmutableList.<SkyValueDirtinessChecker>of(), - PathFragment.EMPTY_FRAGMENT, + BazelSkyframeExecutorConstants.HARDCODED_BLACKLISTED_PACKAGE_PREFIXES, + BazelSkyframeExecutorConstants.ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java index 53687a7305..7ca9f834e0 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java @@ -629,7 +629,8 @@ public class LoadingPhaseRunnerTest { Predicates.<PathFragment>alwaysFalse(), analysisMock.getSkyFunctions(directories), ImmutableList.<SkyValueDirtinessChecker>of(), - PathFragment.EMPTY_FRAGMENT, + BazelSkyframeExecutorConstants.HARDCODED_BLACKLISTED_PACKAGE_PREFIXES, + BazelSkyframeExecutorConstants.ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java index 1d26d0107f..e4ac4c09a0 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java @@ -99,7 +99,8 @@ public class PackageCacheTest extends FoundationTestCase { Predicates.<PathFragment>alwaysFalse(), analysisMock.getSkyFunctions(directories), ImmutableList.<SkyValueDirtinessChecker>of(), - PathFragment.EMPTY_FRAGMENT, + BazelSkyframeExecutorConstants.HARDCODED_BLACKLISTED_PACKAGE_PREFIXES, + BazelSkyframeExecutorConstants.ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java index 19b0c95224..7b929f045e 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java @@ -100,7 +100,9 @@ public class ContainingPackageLookupFunctionTest extends FoundationTestCase { skyFunctions.put( SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null)); skyFunctions.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES, - new BlacklistedPackagePrefixesFunction()); + new BlacklistedPackagePrefixesFunction( + /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(), + /*additionalBlacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT)); skyFunctions.put(SkyFunctions.FILE_STATE, new FileStateFunction( new AtomicReference<TimestampGranularityMonitor>(), externalFilesHelper)); skyFunctions.put(SkyFunctions.FILE, new FileFunction(pkgLocator)); @@ -138,8 +140,6 @@ public class ContainingPackageLookupFunctionTest extends FoundationTestCase { evaluator = new InMemoryMemoizingEvaluator(skyFunctions, differencer); driver = new SequentialBuildDriver(evaluator); PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID()); - PrecomputedValue.BLACKLISTED_PACKAGE_PREFIXES_FILE.set(differencer, - PathFragment.EMPTY_FRAGMENT); PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get()); PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS); RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set( diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java index a9e0fbe762..f82e1ba03e 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java @@ -112,7 +112,9 @@ public final class FilesetEntryFunctionTest extends FoundationTestCase { CrossRepositoryLabelViolationStrategy.ERROR, ImmutableList.of(BuildFileName.BUILD_DOT_BAZEL, BuildFileName.BUILD))); skyFunctions.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES, - new BlacklistedPackagePrefixesFunction()); + new BlacklistedPackagePrefixesFunction( + /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(), + /*additionalBlacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT)); skyFunctions.put(SkyFunctions.FILESET_ENTRY, new FilesetEntryFunction()); skyFunctions.put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction()); @@ -121,8 +123,6 @@ public final class FilesetEntryFunctionTest extends FoundationTestCase { driver = new SequentialBuildDriver(evaluator); PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID()); PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get()); - PrecomputedValue.BLACKLISTED_PACKAGE_PREFIXES_FILE.set(differencer, - PathFragment.EMPTY_FRAGMENT); } private Artifact getSourceArtifact(String path) throws Exception { diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java index 7724160cec..d526c2905d 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java @@ -120,8 +120,6 @@ public abstract class GlobFunctionTest { driver = new SequentialBuildDriver(evaluator); PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID()); PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get()); - PrecomputedValue.BLACKLISTED_PACKAGE_PREFIXES_FILE.set( - differencer, PathFragment.EMPTY_FRAGMENT); PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS); createTestFiles(); @@ -151,7 +149,9 @@ public abstract class GlobFunctionTest { CrossRepositoryLabelViolationStrategy.ERROR, ImmutableList.of(BuildFileName.BUILD_DOT_BAZEL, BuildFileName.BUILD))); skyFunctions.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES, - new BlacklistedPackagePrefixesFunction()); + new BlacklistedPackagePrefixesFunction( + /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(), + /*additionalBlacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT)); skyFunctions.put( SkyFunctions.FILE_STATE, new FileStateFunction( 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 27eef90146..8692fdf41c 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 @@ -79,6 +79,8 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { private SequentialBuildDriver driver; private RecordingDifferencer differencer; private Path emptyPackagePath; + private static final String ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING = + "config/blacklisted.txt"; protected abstract CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy(); @@ -117,7 +119,9 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { SkyFunctions.DIRECTORY_LISTING_STATE, new DirectoryListingStateFunction(externalFilesHelper)); skyFunctions.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES, - new BlacklistedPackagePrefixesFunction()); + new BlacklistedPackagePrefixesFunction( + /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(), + PathFragment.create(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING))); RuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider(); skyFunctions.put(SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(ruleClassProvider)); skyFunctions.put( @@ -149,8 +153,6 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { evaluator = new InMemoryMemoizingEvaluator(skyFunctions, differencer); driver = new SequentialBuildDriver(evaluator); PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID()); - PrecomputedValue.BLACKLISTED_PACKAGE_PREFIXES_FILE.set( - differencer, PathFragment.EMPTY_FRAGMENT); PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get()); PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS); RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set( @@ -205,14 +207,12 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { assertThat(packageLookupValue.getErrorMsg()).isNotNull(); } - @Test public void testBlacklistedPackage() throws Exception { scratch.file("blacklisted/subdir/BUILD"); scratch.file("blacklisted/BUILD"); - PrecomputedValue.BLACKLISTED_PACKAGE_PREFIXES_FILE.set(differencer, - PathFragment.create("config/blacklisted.txt")); - Path blacklist = scratch.file("config/blacklisted.txt", "blacklisted"); + Path blacklist = scratch.overwriteFile( + ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "blacklisted"); ImmutableSet<String> pkgs = ImmutableSet.of("blacklisted/subdir", "blacklisted"); for (String pkg : pkgs) { @@ -222,7 +222,8 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { assertThat(packageLookupValue.getErrorMsg()).isNotNull(); } - scratch.overwriteFile("config/blacklisted.txt", "not_blacklisted"); + scratch.overwriteFile( + ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "not_blacklisted"); RootedPath rootedBlacklist = RootedPath.toRootedPath( blacklist.getParentDirectory().getParentDirectory(), PathFragment.create("config/blacklisted.txt")); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java index bbf9f945d9..cea8acb063 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java @@ -17,25 +17,43 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.skyframe.WalkableGraphUtils.exists; import com.google.common.base.Preconditions; +import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.eventbus.EventBus; -import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; +import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.analysis.ServerDirectories; +import com.google.devtools.build.lib.analysis.util.AnalysisMock; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.PackageIdentifier; +import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.events.Reporter; +import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions; +import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; +import com.google.devtools.build.lib.pkgcache.PathPackageLocator; +import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction; +import com.google.devtools.build.lib.testutil.FoundationTestCase; +import com.google.devtools.build.lib.testutil.TestConstants; +import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; import com.google.devtools.build.skyframe.WalkableGraph; +import com.google.devtools.common.options.Options; import java.io.IOException; +import java.util.UUID; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; /** Tests for {@link PrepareDepsOfPatternsFunction}. */ @RunWith(JUnit4.class) -public class PrepareDepsOfPatternsFunctionSmartNegationTest extends BuildViewTestCase { +public class PrepareDepsOfPatternsFunctionSmartNegationTest extends FoundationTestCase { + private SkyframeExecutor skyframeExecutor; + private static final String ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING = + "config/blacklist.txt"; private static SkyKey getKeyForLabel(Label label) { // Note that these tests used to look for TargetMarker SkyKeys before TargetMarker was @@ -44,6 +62,47 @@ public class PrepareDepsOfPatternsFunctionSmartNegationTest extends BuildViewTes return TransitiveTraversalValue.key(label); } + @Before + public void setUp() throws Exception { + BlazeDirectories directories = + new BlazeDirectories( + new ServerDirectories(getScratch().dir("/install"), getScratch().dir("/output")), + rootDirectory, + AnalysisMock.get().getProductName()); + skyframeExecutor = + SequencedSkyframeExecutor.create( + AnalysisMock.get() + .getPackageFactoryBuilderForTesting(directories) + .build(AnalysisMock.get().createRuleClassProvider(), fileSystem), + fileSystem, + directories, + /*workspaceStatusActionFactory=*/ null, + AnalysisMock.get().createRuleClassProvider().getBuildInfoFactories(), + ImmutableList.of(), + Predicates.alwaysFalse(), + AnalysisMock.get().getSkyFunctions(directories), + ImmutableList.of(), + BazelSkyframeExecutorConstants.HARDCODED_BLACKLISTED_PACKAGE_PREFIXES, + PathFragment.create(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING), + BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, + BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); + TestConstants.processSkyframeExecutorForTesting(skyframeExecutor); + skyframeExecutor.preparePackageLoading( + new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), + Options.getDefaults(PackageCacheOptions.class), + Options.getDefaults(SkylarkSemanticsOptions.class), + AnalysisMock.get().getDefaultsPackageContent(), + UUID.randomUUID(), + ImmutableMap.<String, String>of(), + ImmutableMap.<String, String>of(), + new TimestampGranularityMonitor(null)); + skyframeExecutor.injectExtraPrecomputedValues(ImmutableList.of(PrecomputedValue.injected( + RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, + ImmutableMap.<RepositoryName, PathFragment>of()))); + scratch.file(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING); + } + @Test public void testRecursiveEvaluationFailsOnBadBuildFile() throws Exception { // Given a well-formed package "@//foo" and a malformed package "@//foo/foo", @@ -89,9 +148,7 @@ public class PrepareDepsOfPatternsFunctionSmartNegationTest extends BuildViewTes ImmutableList<String> patternSequence = ImmutableList.of("//foo/..."); // and a blacklist for the malformed package, - getSkyframeExecutor().setBlacklistedPackagePrefixesFile( - PathFragment.create("config/blacklist.txt")); - scratch.file("config/blacklist.txt", "foo/foo"); + scratch.overwriteFile(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "foo/foo"); assertSkipsFoo(patternSequence); } @@ -140,12 +197,12 @@ public class PrepareDepsOfPatternsFunctionSmartNegationTest extends BuildViewTes // When PrepareDepsOfPatternsFunction completes evaluation, EvaluationResult<SkyValue> evaluationResult = - getSkyframeExecutor() + skyframeExecutor .getDriverForTesting() .evaluate( singletonTargetPattern, keepGoing, - LOADING_PHASE_THREADS, + /*numThreads=*/ 100, new Reporter(new EventBus(), eventCollector)); // The evaluation has no errors if success was expected. assertThat(evaluationResult.hasError()).isNotEqualTo(successExpected); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java index e0d3bdfab7..f18e2b6149 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java @@ -116,7 +116,9 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe CrossRepositoryLabelViolationStrategy.ERROR, ImmutableList.of(BuildFileName.BUILD_DOT_BAZEL, BuildFileName.BUILD))); skyFunctions.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES, - new BlacklistedPackagePrefixesFunction()); + new BlacklistedPackagePrefixesFunction( + /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(), + /*additionalBlacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT)); skyFunctions.put(SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null)); skyFunctions.put(SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(ruleClassProvider)); @@ -142,8 +144,6 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe driver = new SequentialBuildDriver(evaluator); PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID()); PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get()); - PrecomputedValue.BLACKLISTED_PACKAGE_PREFIXES_FILE.set( - differencer, PathFragment.EMPTY_FRAGMENT); } private Artifact sourceArtifact(String path) { |