diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build')
7 files changed, 39 insertions, 13 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 811c130bb7..447772460d 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 @@ -215,9 +215,15 @@ public abstract class AnalysisTestCase extends FoundationTestCase { ImmutableMap.<String, String>of(), ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); - skyframeExecutor.injectExtraPrecomputedValues(ImmutableList.of(PrecomputedValue.injected( - RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, - ImmutableMap.<RepositoryName, PathFragment>of()))); + skyframeExecutor.injectExtraPrecomputedValues( + ImmutableList.of( + PrecomputedValue.injected( + RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, + ImmutableMap.<RepositoryName, PathFragment>of()), + PrecomputedValue.injected( + RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING, + RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY))); + packageManager = skyframeExecutor.getPackageManager(); buildView = new BuildViewForTesting(directories, ruleClassProvider, skyframeExecutor, null); 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 6f4f078c1a..cc16cd4d4f 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 @@ -233,10 +233,14 @@ public abstract class BuildViewTestCase extends FoundationTestCase { mutableActionGraph = new MapBasedActionGraph(actionKeyContext); ruleClassProvider = getRuleClassProvider(); - ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues = ImmutableList.of( - PrecomputedValue.injected( - RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, - ImmutableMap.<RepositoryName, PathFragment>of())); + ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues = + ImmutableList.of( + PrecomputedValue.injected( + RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, + ImmutableMap.<RepositoryName, PathFragment>of()), + PrecomputedValue.injected( + RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING, + RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY)); PackageFactory.BuilderForTesting pkgFactoryBuilder = analysisMock .getPackageFactoryBuilderForTesting(directories) 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 1c314f4bbc..4899920f02 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 @@ -133,9 +133,14 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE, DefaultBuildOptionsForTesting.getDefaultBuildOptionsForTest(ruleClassProvider)); TestConstants.processSkyframeExecutorForTesting(skyframeExecutor); - skyframeExecutor.injectExtraPrecomputedValues(ImmutableList.of(PrecomputedValue.injected( - RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, - ImmutableMap.<RepositoryName, PathFragment>of()))); + skyframeExecutor.injectExtraPrecomputedValues( + ImmutableList.of( + PrecomputedValue.injected( + RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, + ImmutableMap.<RepositoryName, PathFragment>of()), + PrecomputedValue.injected( + RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING, + RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY))); PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); packageCacheOptions.showLoadingProgress = true; packageCacheOptions.globbingThreads = 7; diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java index 8bde0bc8d2..cc4a332fb6 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java @@ -137,6 +137,8 @@ public class RepositoryDelegatorTest extends FoundationTestCase { ImmutableMap.<RepositoryName, PathFragment>builder() .put(RepositoryName.createFromValidStrippedName("foo"), overrideDirectory.asFragment()) .build()); + RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING.set( + differencer, RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY); PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get()); PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS); } 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 4c845afc2d..e02117f48c 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 @@ -153,6 +153,8 @@ public class ContainingPackageLookupFunctionTest extends FoundationTestCase { PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS); RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set( differencer, ImmutableMap.<RepositoryName, PathFragment>of()); + RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING.set( + differencer, RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY); } private ContainingPackageLookupValue lookupContainingPackage(String packageName) 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 75625593ae..fa6f05cb13 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 @@ -167,6 +167,8 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS); RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set( differencer, ImmutableMap.<RepositoryName, PathFragment>of()); + RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING.set( + differencer, RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY); } protected PackageLookupValue lookupPackage(String packageName) throws InterruptedException { 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 85decff337..06c4363795 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 @@ -109,9 +109,14 @@ public class PrepareDepsOfPatternsFunctionSmartNegationTest extends FoundationTe ImmutableMap.<String, String>of(), ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(null)); - skyframeExecutor.injectExtraPrecomputedValues(ImmutableList.of(PrecomputedValue.injected( - RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, - ImmutableMap.<RepositoryName, PathFragment>of()))); + skyframeExecutor.injectExtraPrecomputedValues( + ImmutableList.of( + PrecomputedValue.injected( + RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, + ImmutableMap.<RepositoryName, PathFragment>of()), + PrecomputedValue.injected( + RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING, + RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY))); scratch.file(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING); } |