diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis')
3 files changed, 18 insertions, 15 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 a91c4000cd..8aea62c609 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 @@ -175,11 +175,12 @@ public abstract class AnalysisTestCase extends FoundationTestCase { getPrecomputedValues(), ImmutableList.<SkyValueDirtinessChecker>of(), analysisMock.getProductName()); + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 3; skyframeExecutor.preparePackageLoading( pkgLocator, - Options.getDefaults(PackageCacheOptions.class).defaultVisibility, - true, - 3, + packageCacheOptions, ruleClassProvider.getDefaultsPackageContent( analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), @@ -279,11 +280,11 @@ public abstract class AnalysisTestCase extends FoundationTestCase { PathPackageLocator pathPackageLocator = PathPackageLocator.create( outputBase, packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory); + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; skyframeExecutor.preparePackageLoading( pathPackageLocator, - packageCacheOptions.defaultVisibility, - true, - 7, + packageCacheOptions, ruleClassProvider.getDefaultsPackageContent( analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), 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 1f76af4fc0..44157b437f 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 @@ -225,11 +225,12 @@ public abstract class BuildViewTestCase extends FoundationTestCase { getPrecomputedValues(), ImmutableList.<SkyValueDirtinessChecker>of(), analysisMock.getProductName()); + packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; skyframeExecutor.preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), - ConstantRuleVisibility.PUBLIC, - true, - 7, + packageCacheOptions, "", UUID.randomUUID(), ImmutableMap.<String, String>of(), @@ -315,11 +316,11 @@ public abstract class BuildViewTestCase extends FoundationTestCase { private void setUpSkyframe() { PathPackageLocator pkgLocator = PathPackageLocator.create( outputBase, packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory); + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; skyframeExecutor.preparePackageLoading( pkgLocator, - packageCacheOptions.defaultVisibility, - true, - 7, + packageCacheOptions, ruleClassProvider.getDefaultsPackageContent(optionsParser), UUID.randomUUID(), ImmutableMap.<String, String>of(), 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 45a135b5df..cdab315593 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 @@ -115,11 +115,12 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { ImmutableList.<SkyValueDirtinessChecker>of(), analysisMock.getProductName()); + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; skyframeExecutor.preparePackageLoading( pkgLocator, - Options.getDefaults(PackageCacheOptions.class).defaultVisibility, - true, - 7, + packageCacheOptions, ruleClassProvider.getDefaultsPackageContent( analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), |