From 777f3afea4195e094d45bdfc317b236146117ff7 Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Wed, 8 Feb 2017 17:22:02 +0000 Subject: Introduce a Skyframe function: ActionEnvironmentFunction ActionEnvironmentFunction returns the list of environment variable with the one overwritten by --action_env being replaced. This let other Skyframe function declares dependency to any value of the environment and being influenced by the --action_env flag. This will be used to declare dependency of remote repositories on environment variables (step 3 of https://bazel.build/designs/2016/10/18/repository-invalidation.html) -- Change-Id: I1ed3fb6f48e8e17d4d64c903fccecb6ed7596350 Reviewed-on: https://cr.bazel.build/7974 PiperOrigin-RevId: 146918603 MOS_MIGRATED_REVID=146918603 --- .../com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java | 2 ++ .../com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 2 ++ .../google/devtools/build/lib/analysis/util/ConfigurationTestCase.java | 1 + .../google/devtools/build/lib/packages/util/PackageLoadingTestCase.java | 2 ++ .../com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java | 2 ++ .../com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java | 1 + .../java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java | 1 + .../com/google/devtools/build/lib/skyframe/PackageFunctionTest.java | 2 ++ .../google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java | 2 ++ .../google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java | 1 + .../devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java | 1 + .../google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java | 1 + 12 files changed, 18 insertions(+) (limited to 'src/test/java/com') 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 7bf11a80e0..03128110d4 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 @@ -192,6 +192,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); packageManager = skyframeExecutor.getPackageManager(); loadingPhaseRunner = skyframeExecutor.getLoadingPhaseRunner( @@ -322,6 +323,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); skyframeExecutor.invalidateFilesUnderPathForTesting(reporter, ModifiedFileSet.EVERYTHING_MODIFIED, rootDirectory); 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 2522b18254..72b756d59d 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 @@ -243,6 +243,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { "", UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), tsgm); useConfiguration(); setUpSkyframe(); @@ -351,6 +352,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { ruleClassProvider.getDefaultsPackageContent(optionsParser), UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), tsgm); skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages())); } 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 719391be5d..469d0b26c6 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 @@ -129,6 +129,7 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); mockToolsConfig = new MockToolsConfig(rootDirectory); 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 d2234c122c..98b4bd6d9d 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 @@ -138,6 +138,7 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { defaultsPackageContents, UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); } @@ -152,6 +153,7 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { loadingMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); skyframeExecutor.setDeletedPackages( ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages())); 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 bf49ba0539..7527f8858b 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 @@ -498,6 +498,7 @@ public class IncrementalLoadingTest { "", UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); } @@ -584,6 +585,7 @@ public class IncrementalLoadingTest { "", UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); skyframeExecutor.invalidateFilesUnderPathForTesting( new Reporter(), modifiedFileSet, workspace); 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 79e097688e..bd06f06a22 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 @@ -627,6 +627,7 @@ public class LoadingPhaseRunnerTest { analysisMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(clock)); loadingPhaseRunner = skyframeExecutor.getLoadingPhaseRunner(pkgFactory.getRuleClassNames(), useNewImpl); 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 a7a5918c8c..3c6bbe4321 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 @@ -113,6 +113,7 @@ public class PackageCacheTest extends FoundationTestCase { analysisMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); skyframeExecutor.setDeletedPackages( ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages())); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java index 0615045478..02c2589ce6 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java @@ -84,6 +84,7 @@ public class PackageFunctionTest extends BuildViewTestCase { "", UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); } @@ -453,6 +454,7 @@ public class PackageFunctionTest extends BuildViewTestCase { "", UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), tsgm); value = validPackage(skyKey); assertThat( 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 56452fb155..892f72126f 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 @@ -415,6 +415,7 @@ public class SkyframeLabelVisitorTest extends SkyframeLabelVisitorTestCase { loadingMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); this.visitor = getSkyframeExecutor().pkgLoader(); scratch.file("pkg/BUILD", "sh_library(name = 'x', deps = ['z'])", "sh_library(name = 'z')"); @@ -462,6 +463,7 @@ public class SkyframeLabelVisitorTest extends SkyframeLabelVisitorTestCase { loadingMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); this.visitor = getSkyframeExecutor().pkgLoader(); scratch.file("a/BUILD", "subinclude('//b:c/d/foo')"); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java index a1dffc0f1a..1c7b8e4d33 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java @@ -168,6 +168,7 @@ public class SkylarkFileContentHashTests extends BuildViewTestCase { "", UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); SkyKey pkgLookupKey = PackageValue.key(PackageIdentifier.parse("@//" + pkg)); EvaluationResult result = diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java index 43750f4c51..3483b5658e 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java @@ -59,6 +59,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase { "", UUID.randomUUID(), ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 06c38e6261..2eecace8d0 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -211,6 +211,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { evaluationProgressReceiver); final SequentialBuildDriver driver = new SequentialBuildDriver(evaluator); PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID()); + PrecomputedValue.ACTION_ENV.set(differencer, ImmutableMap.of()); PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get()); return new Builder() { -- cgit v1.2.3