diff options
Diffstat (limited to 'src/test/java/com/google')
13 files changed, 18 insertions, 18 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 11fe5375b4..c7d1becb1f 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 @@ -213,8 +213,8 @@ public abstract class AnalysisTestCase extends FoundationTestCase { analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); skyframeExecutor.injectExtraPrecomputedValues( ImmutableList.of( PrecomputedValue.injected( @@ -342,8 +342,8 @@ public abstract class AnalysisTestCase extends FoundationTestCase { analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); skyframeExecutor.invalidateFilesUnderPathForTesting( reporter, ModifiedFileSet.EVERYTHING_MODIFIED, Root.fromPath(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 1f9738148e..5fc77cbe63 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 @@ -286,8 +286,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { "", UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), tsgm); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); useConfiguration(); setUpSkyframe(); // Also initializes ResourceManager. @@ -404,8 +404,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { ruleClassProvider.getDefaultsPackageContent(optionsParser), UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), tsgm); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages())); skyframeExecutor.injectExtraPrecomputedValues( ImmutableList.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 fb61a6e841..522b5fa232 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 @@ -152,8 +152,8 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); mockToolsConfig = new MockToolsConfig(rootDirectory); analysisMock.setupMockClient(mockToolsConfig); 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 88a02fb400..85e486445e 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 @@ -152,8 +152,8 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { defaultsPackageContents, UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); } private void setUpSkyframe() { @@ -174,8 +174,8 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { loadingMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); skyframeExecutor.setDeletedPackages( ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages())); } 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 2890619c2e..d25e255bd4 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 @@ -126,8 +126,8 @@ public class BuildFileModificationTest extends FoundationTestCase { analysisMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(clock)); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); 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 866844df31..ba9e5e4e37 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 @@ -506,8 +506,8 @@ public class IncrementalLoadingTest { "", UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); } Path addFile(String fileName, String... content) throws IOException { @@ -597,8 +597,8 @@ public class IncrementalLoadingTest { "", UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); skyframeExecutor.invalidateFilesUnderPathForTesting( new Reporter(new EventBus()), modifiedFileSet, Root.fromPath(workspace)); ((SequencedSkyframeExecutor) skyframeExecutor).handleDiffs(new Reporter(new EventBus())); 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 50e6ecf0e6..fdb6e80755 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 @@ -778,8 +778,8 @@ public class LoadingPhaseRunnerTest { analysisMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(clock)); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); this.options = Options.getDefaults(LoadingOptions.class); } 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 461b21061a..97c4f2e209 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 @@ -139,8 +139,8 @@ public class PackageCacheTest extends FoundationTestCase { analysisMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); 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 0dd046d67d..1a3dcdd50a 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 @@ -91,8 +91,8 @@ public class PackageFunctionTest extends BuildViewTestCase { "", UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); } @Override @@ -323,8 +323,8 @@ public class PackageFunctionTest extends BuildViewTestCase { "", UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), tsgm); + getSkyframeExecutor().setActionEnv(ImmutableMap.<String, String>of()); assertSrcs(validPackage(skyKey), "foo", "//foo:a.config", "//foo:b.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 06c4363795..18e5ae48a7 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 @@ -107,8 +107,8 @@ public class PrepareDepsOfPatternsFunctionSmartNegationTest extends FoundationTe AnalysisMock.get().getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(null)); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); skyframeExecutor.injectExtraPrecomputedValues( ImmutableList.of( PrecomputedValue.injected( 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 a665d4055a..bb300907ff 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,8 +415,8 @@ public class SkyframeLabelVisitorTest extends SkyframeLabelVisitorTestCase { loadingMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); this.visitor = getSkyframeExecutor().pkgLoader(); scratch.file("pkg/BUILD", "sh_library(name = 'x', deps = ['z'])", "sh_library(name = 'z')"); assertLabelsVisited( 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 458adbff56..58107d6ff3 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 @@ -173,8 +173,8 @@ public class SkylarkFileContentHashTests extends BuildViewTestCase { "", UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); SkyKey pkgLookupKey = PackageValue.key(PackageIdentifier.parse("@//" + pkg)); EvaluationResult<PackageValue> result = SkyframeExecutorTestUtils.evaluate( 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 cee3c4cebc..7ffc718749 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 @@ -65,8 +65,8 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase { "", UUID.randomUUID(), ImmutableMap.<String, String>of(), - ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); + skyframeExecutor.setActionEnv(ImmutableMap.<String, String>of()); this.preludeLabelRelativePath = getRuleClassProvider().getPreludeLabel().toPathFragment().toString(); } |