diff options
author | Janak Ramakrishnan <janakr@google.com> | 2016-09-27 14:58:26 +0000 |
---|---|---|
committer | Yun Peng <pcloudy@google.com> | 2016-09-27 16:24:55 +0000 |
commit | 326c698dbab89fde97a234586efef75c5f8b7111 (patch) | |
tree | 6dee789d6e88484d8a58c7d19d428f6f1e683a70 /src/test | |
parent | a5b226942bd8e7667e8da7067ec9bf55d1d62508 (diff) |
Refactor SkyframeExecutor#preparePackageLoading to pass all PackageCacheOptions as a bundle.
This will allow me to thread a new flag through more easily in the future.
--
MOS_MIGRATED_REVID=134406676
Diffstat (limited to 'src/test')
11 files changed, 93 insertions, 48 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(), 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 efa36bf378..812436dbe3 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 @@ -48,6 +48,7 @@ import com.google.devtools.build.lib.vfs.ModifiedFileSet; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyFunctionName; +import com.google.devtools.common.options.Options; import com.google.devtools.common.options.OptionsParser; import java.io.IOException; import java.util.Arrays; @@ -126,21 +127,27 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { } protected void setUpSkyframe(RuleVisibility defaultVisibility, String defaultsPackageContents) { + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.defaultVisibility = defaultVisibility; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = GLOBBING_THREADS; skyframeExecutor.preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), - defaultVisibility, true, GLOBBING_THREADS, defaultsPackageContents, - UUID.randomUUID(), ImmutableMap.<String, String>of(), + packageCacheOptions, + defaultsPackageContents, + UUID.randomUUID(), + ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); } private void setUpSkyframe(PackageCacheOptions packageCacheOptions) { PathPackageLocator pkgLocator = PathPackageLocator.create( outputBase, packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory); + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = GLOBBING_THREADS; skyframeExecutor.preparePackageLoading( pkgLocator, - packageCacheOptions.defaultVisibility, - true, - GLOBBING_THREADS, + packageCacheOptions, loadingMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), 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 b667018866..ab66841f3b 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 @@ -55,6 +55,7 @@ import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyFunctionName; +import com.google.devtools.common.options.Options; import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; @@ -482,10 +483,16 @@ public class IncrementalLoadingTest { ImmutableList.<PrecomputedValue.Injected>of(), ImmutableList.<SkyValueDirtinessChecker>of(), loadingMock.getProductName()); + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; skyframeExecutor.preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.of(workspace)), - ConstantRuleVisibility.PUBLIC, true, 7, "", - UUID.randomUUID(), ImmutableMap.<String, String>of(), + packageCacheOptions, + "", + UUID.randomUUID(), + ImmutableMap.<String, String>of(), new TimestampGranularityMonitor(BlazeClock.instance())); } @@ -562,10 +569,16 @@ public class IncrementalLoadingTest { clock.advanceMillis(1); modifiedFileSet = getModifiedFileSet(); + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; skyframeExecutor.preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.of(workspace)), - ConstantRuleVisibility.PUBLIC, true, 7, "", - UUID.randomUUID(), ImmutableMap.<String, String>of(), + packageCacheOptions, + "", + UUID.randomUUID(), + ImmutableMap.<String, String>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 1c3ca978c9..0688416128 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 @@ -614,11 +614,13 @@ public class LoadingPhaseRunnerTest { analysisMock.getProductName()); PathPackageLocator pkgLocator = PathPackageLocator.create( null, options.packagePath, storedErrors, workspace, workspace); + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; skyframeExecutor.preparePackageLoading( pkgLocator, - ConstantRuleVisibility.PRIVATE, - true, - 7, + packageCacheOptions, analysisMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), 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 5ab8687ae6..a68ad4e388 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 @@ -104,11 +104,11 @@ public class PackageCacheTest extends FoundationTestCase { private void setUpSkyframe(PackageCacheOptions packageCacheOptions) { PathPackageLocator pkgLocator = PathPackageLocator.create( null, packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory); + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; skyframeExecutor.preparePackageLoading( pkgLocator, - packageCacheOptions.defaultVisibility, - true, - 7, + packageCacheOptions, analysisMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), 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 fcda5f41d7..b5d8c16815 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 @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.packages.ConstantRuleVisibility; import com.google.devtools.build.lib.packages.NoSuchTargetException; import com.google.devtools.build.lib.packages.Preprocessor; import com.google.devtools.build.lib.packages.util.SubincludePreprocessor; +import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils; import com.google.devtools.build.lib.testutil.ManualClock; @@ -51,6 +52,7 @@ import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.RecordingDifferencer; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; +import com.google.devtools.common.options.Options; import java.io.IOException; import java.util.Collection; import java.util.Map; @@ -71,12 +73,14 @@ public class PackageFunctionTest extends BuildViewTestCase { private CustomInMemoryFs fs = new CustomInMemoryFs(new ManualClock()); private void preparePackageLoading(Path... roots) { + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; getSkyframeExecutor() .preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.copyOf(roots)), - ConstantRuleVisibility.PUBLIC, - true, - 7, + packageCacheOptions, "", UUID.randomUUID(), ImmutableMap.<String, String>of(), @@ -441,12 +445,14 @@ public class PackageFunctionTest extends BuildViewTestCase { Label.parseAbsoluteUnchecked("//foo:b.txt")) .inOrder(); getSkyframeExecutor().resetEvaluator(); + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; getSkyframeExecutor() .preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.<Path>of(rootDirectory)), - ConstantRuleVisibility.PUBLIC, - true, - 7, + packageCacheOptions, "", UUID.randomUUID(), ImmutableMap.<String, String>of(), 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 34570a0b3f..f5c99ee35d 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 @@ -26,6 +26,7 @@ import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.events.EventKind; import com.google.devtools.build.lib.packages.ConstantRuleVisibility; import com.google.devtools.build.lib.packages.util.SubincludePreprocessor; +import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.util.BlazeClock; import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor; @@ -34,6 +35,7 @@ import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.ModifiedFileSet; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; +import com.google.devtools.common.options.Options; import java.io.IOException; import java.util.Collection; import java.util.UUID; @@ -401,12 +403,14 @@ public class SkyframeLabelVisitorTest extends SkyframeLabelVisitorTestCase { preprocessorFactorySupplier.inject( new SubincludePreprocessor( scratch.getFileSystem(), getSkyframeExecutor().getPackageManager())); + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; getSkyframeExecutor() .preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), - ConstantRuleVisibility.PRIVATE, - true, - 7, + packageCacheOptions, loadingMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), @@ -446,12 +450,14 @@ public class SkyframeLabelVisitorTest extends SkyframeLabelVisitorTestCase { preprocessorFactorySupplier.inject( new SubincludePreprocessor( scratch.getFileSystem(), getSkyframeExecutor().getPackageManager())); + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; getSkyframeExecutor() .preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), - ConstantRuleVisibility.PRIVATE, - true, - 7, + packageCacheOptions, loadingMock.getDefaultsPackageContent(), UUID.randomUUID(), ImmutableMap.<String, String>of(), 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 d5dff75223..a1dffc0f1a 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 @@ -23,12 +23,14 @@ import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.packages.ConstantRuleVisibility; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; +import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils; import com.google.devtools.build.lib.util.BlazeClock; import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor; import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.SkyKey; +import com.google.devtools.common.options.Options; import java.util.Collection; import java.util.UUID; import org.junit.Before; @@ -155,12 +157,14 @@ public class SkylarkFileContentHashTests extends BuildViewTestCase { * Asserts that the targets and it's Skylark dependencies were loaded properly. */ private String getHash(String pkg, String name) throws Exception { + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; getSkyframeExecutor() .preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), - ConstantRuleVisibility.PUBLIC, - true, - 7, + packageCacheOptions, "", UUID.randomUUID(), ImmutableMap.<String, String>of(), 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 f869e655c4..43750f4c51 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 @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.ConstantRuleVisibility; +import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils; import com.google.devtools.build.lib.util.BlazeClock; @@ -31,6 +32,7 @@ import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.skyframe.ErrorInfo; import com.google.devtools.build.skyframe.EvaluationResult; import com.google.devtools.build.skyframe.SkyKey; +import com.google.devtools.common.options.Options; import java.util.UUID; import org.junit.Before; import org.junit.Test; @@ -46,12 +48,14 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase { @Before public final void preparePackageLoading() throws Exception { Path alternativeRoot = scratch.dir("/root_2"); + PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); + packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC; + packageCacheOptions.showLoadingProgress = true; + packageCacheOptions.globbingThreads = 7; getSkyframeExecutor() .preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory, alternativeRoot)), - ConstantRuleVisibility.PUBLIC, - true, - 7, + packageCacheOptions, "", UUID.randomUUID(), ImmutableMap.<String, String>of(), |