diff options
10 files changed, 58 insertions, 144 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java index 845429ec3f..59f9b17cde 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java @@ -17,7 +17,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.base.Predicate; -import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -28,7 +27,6 @@ import com.google.common.collect.Sets; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.BuildView.Options; import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.WorkspaceStatusAction; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction.Factory; import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory; import com.google.devtools.build.lib.analysis.config.BinTools; @@ -149,7 +147,7 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { this.customDirtinessCheckers = customDirtinessCheckers; } - private static SequencedSkyframeExecutor create( + public static SequencedSkyframeExecutor create( PackageFactory pkgFactory, BlazeDirectories directories, BinTools binTools, @@ -187,131 +185,6 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { return skyframeExecutor; } - public static SequencedSkyframeExecutor create( - PackageFactory pkgFactory, - BlazeDirectories directories, - BinTools binTools, - Factory workspaceStatusActionFactory, - ImmutableList<BuildInfoFactory> buildInfoFactories, - Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories, - Predicate<PathFragment> allowedMissingInputs, - ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions, - ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues, - Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, - String productName, - CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy, - List<BuildFileName> buildFilesByPriority, - ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile) { - return create( - pkgFactory, - directories, - binTools, - workspaceStatusActionFactory, - buildInfoFactories, - diffAwarenessFactories, - allowedMissingInputs, - extraSkyFunctions, - extraPrecomputedValues, - customDirtinessCheckers, - /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT, - productName, - crossRepositoryLabelViolationStrategy, - buildFilesByPriority, - actionOnIOExceptionReadingBuildFile); - } - - @VisibleForTesting - public static SequencedSkyframeExecutor createForTesting( - PackageFactory pkgFactory, - BlazeDirectories directories, - BinTools binTools, - Factory workspaceStatusActionFactory, - ImmutableList<BuildInfoFactory> buildInfoFactories, - Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories, - Predicate<PathFragment> allowedMissingInputs, - ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions, - ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues, - Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, - String productName) { - return createForTesting( - pkgFactory, - directories, - binTools, - workspaceStatusActionFactory, - buildInfoFactories, - diffAwarenessFactories, - allowedMissingInputs, - extraSkyFunctions, - extraPrecomputedValues, - customDirtinessCheckers, - productName, - BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, - BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, - BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); - } - - @VisibleForTesting - public static SequencedSkyframeExecutor createForTesting( - PackageFactory pkgFactory, - BlazeDirectories directories, - BinTools binTools, - Factory workspaceStatusActionFactory, - ImmutableList<BuildInfoFactory> buildInfoFactories, - Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories, - Predicate<PathFragment> allowedMissingInputs, - ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions, - ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues, - Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, - String productName, - CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy, - ImmutableList<BuildFileName> buildFilesByPriority, - ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile) { - return create( - pkgFactory, - directories, - binTools, - workspaceStatusActionFactory, - buildInfoFactories, - diffAwarenessFactories, - allowedMissingInputs, - extraSkyFunctions, - extraPrecomputedValues, - customDirtinessCheckers, - /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT, - productName, - crossRepositoryLabelViolationStrategy, - buildFilesByPriority, - actionOnIOExceptionReadingBuildFile); - } - - @VisibleForTesting - public static SequencedSkyframeExecutor createForTesting( - PackageFactory pkgFactory, - BlazeDirectories directories, - BinTools binTools, - WorkspaceStatusAction.Factory workspaceStatusActionFactory, - ImmutableList<BuildInfoFactory> buildInfoFactories, - Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories, - PathFragment blacklistedPackagePrefixesFile, - String productName) { - return create( - pkgFactory, - directories, - binTools, - workspaceStatusActionFactory, - buildInfoFactories, - diffAwarenessFactories, - Predicates.<PathFragment>alwaysFalse(), - ImmutableMap.<SkyFunctionName, SkyFunction>of(), - ImmutableList.<PrecomputedValue.Injected>of(), - ImmutableList.<SkyValueDirtinessChecker>of(), - blacklistedPackagePrefixesFile, - productName, - BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, - BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, - BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); - } - @Override protected BuildDriver getBuildDriver() { return new SequentialBuildDriver(memoizingEvaluator); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java index 3617c13f13..3dd9c0dc22 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java @@ -54,6 +54,7 @@ public class SequencedSkyframeExecutorFactory implements SkyframeExecutorFactory extraSkyFunctions, extraPrecomputedValues, customDirtinessCheckers, + PathFragment.EMPTY_FRAGMENT, productName, BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, 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 04e8327cd8..b676cc576c 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 @@ -52,6 +52,7 @@ import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; import com.google.devtools.build.lib.pkgcache.PackageManager; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction; +import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants; import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey; import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.PrecomputedValue; @@ -174,7 +175,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { .build(ruleClassProvider, scratch.getFileSystem()); BinTools binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); skyframeExecutor = - SequencedSkyframeExecutor.createForTesting( + SequencedSkyframeExecutor.create( pkgFactory, directories, binTools, @@ -185,7 +186,11 @@ public abstract class AnalysisTestCase extends FoundationTestCase { analysisMock.getSkyFunctions(), getPrecomputedValues(), ImmutableList.<SkyValueDirtinessChecker>of(), - analysisMock.getProductName()); + PathFragment.EMPTY_FRAGMENT, + analysisMock.getProductName(), + BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, + BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); packageCacheOptions.showLoadingProgress = true; packageCacheOptions.globbingThreads = 3; 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 9b46c818c3..20b779ccff 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 @@ -120,6 +120,7 @@ import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunctio import com.google.devtools.build.lib.rules.test.BaselineCoverageAction; import com.google.devtools.build.lib.rules.test.InstrumentedFilesProvider; import com.google.devtools.build.lib.skyframe.AspectValue; +import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants; import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey; import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.LegacyLoadingPhaseRunner; @@ -223,7 +224,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { .build(ruleClassProvider, scratch.getFileSystem()); tsgm = new TimestampGranularityMonitor(BlazeClock.instance()); skyframeExecutor = - SequencedSkyframeExecutor.createForTesting( + SequencedSkyframeExecutor.create( pkgFactory, directories, binTools, @@ -234,7 +235,11 @@ public abstract class BuildViewTestCase extends FoundationTestCase { analysisMock.getSkyFunctions(), getPrecomputedValues(), ImmutableList.<SkyValueDirtinessChecker>of(), - analysisMock.getProductName()); + PathFragment.EMPTY_FRAGMENT, + analysisMock.getProductName(), + BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, + BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); skyframeExecutor.injectExtraPrecomputedValues(extraPrecomputedValues); packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC; packageCacheOptions.showLoadingProgress = true; 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 d87ac01d82..6970641bfe 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 @@ -36,6 +36,7 @@ import com.google.devtools.build.lib.packages.util.MockToolsConfig; import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction; +import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants; import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; @@ -108,7 +109,7 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { new AnalysisTestUtil.DummyWorkspaceStatusActionFactory(directories); skyframeExecutor = - SequencedSkyframeExecutor.createForTesting( + SequencedSkyframeExecutor.create( pkgFactory, directories, BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()), @@ -119,7 +120,11 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { analysisMock.getSkyFunctions(), ImmutableList.<PrecomputedValue.Injected>of(), ImmutableList.<SkyValueDirtinessChecker>of(), - analysisMock.getProductName()); + PathFragment.EMPTY_FRAGMENT, + analysisMock.getProductName(), + BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, + BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); skyframeExecutor.injectExtraPrecomputedValues(ImmutableList.of(PrecomputedValue.injected( RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, ImmutableMap.<RepositoryName, PathFragment>of()))); 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 86eb8e06c6..c93beb04b0 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 @@ -33,6 +33,7 @@ import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; import com.google.devtools.build.lib.pkgcache.PackageManager; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; +import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants; import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; @@ -102,7 +103,7 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { private SkyframeExecutor createSkyframeExecutor() { SkyframeExecutor skyframeExecutor = - SequencedSkyframeExecutor.createForTesting( + SequencedSkyframeExecutor.create( packageFactory, new BlazeDirectories( outputBase, outputBase, rootDirectory, loadingMock.getProductName()), @@ -114,7 +115,11 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { ImmutableMap.<SkyFunctionName, SkyFunction>of(), ImmutableList.<PrecomputedValue.Injected>of(), ImmutableList.<SkyValueDirtinessChecker>of(), - loadingMock.getProductName()); + PathFragment.EMPTY_FRAGMENT, + loadingMock.getProductName(), + BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, + BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); return skyframeExecutor; } 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 94aca28b1a..67dd5795ac 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 @@ -25,6 +25,7 @@ import com.google.devtools.build.lib.analysis.util.AnalysisMock; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.packages.NoSuchPackageException; import com.google.devtools.build.lib.packages.Package; +import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants; import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; @@ -73,7 +74,7 @@ public class BuildFileModificationTest extends FoundationTestCase { BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, rootDirectory, analysisMock.getProductName()); skyframeExecutor = - SequencedSkyframeExecutor.createForTesting( + SequencedSkyframeExecutor.create( analysisMock .getPackageFactoryBuilderForTesting() .build(ruleClassProvider, scratch.getFileSystem()), @@ -86,7 +87,11 @@ public class BuildFileModificationTest extends FoundationTestCase { AnalysisMock.get().getSkyFunctions(), ImmutableList.<PrecomputedValue.Injected>of(), ImmutableList.<SkyValueDirtinessChecker>of(), - analysisMock.getProductName()); + PathFragment.EMPTY_FRAGMENT, + analysisMock.getProductName(), + BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, + BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); OptionsParser parser = OptionsParser.newOptionsParser( PackageCacheOptions.class, SkylarkSemanticsOptions.class); analysisMock.getInvocationPolicyEnforcer().enforce(parser); 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 afa6a89cbd..c97af34ec6 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 @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.packages.util.LoadingMock; +import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants; import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; @@ -461,7 +462,7 @@ public class IncrementalLoadingTest { LoadingMock loadingMock = LoadingMock.get(); skyframeExecutor = - SequencedSkyframeExecutor.createForTesting( + SequencedSkyframeExecutor.create( loadingMock .getPackageFactoryBuilderForTesting() .build(loadingMock.createRuleClassProvider(), fs), @@ -478,7 +479,11 @@ public class IncrementalLoadingTest { ImmutableMap.<SkyFunctionName, SkyFunction>of(), ImmutableList.<PrecomputedValue.Injected>of(), ImmutableList.<SkyValueDirtinessChecker>of(), - loadingMock.getProductName()); + PathFragment.EMPTY_FRAGMENT, + loadingMock.getProductName(), + BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, + BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.class); packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC; packageCacheOptions.showLoadingProgress = true; 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 0e1788e64b..971fe2e2d5 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 @@ -38,6 +38,7 @@ import com.google.devtools.build.lib.packages.ConstantRuleVisibility; import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.packages.util.MockToolsConfig; +import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants; import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; @@ -617,7 +618,7 @@ public class LoadingPhaseRunnerTest { workspace, analysisMock.getProductName()); skyframeExecutor = - SequencedSkyframeExecutor.createForTesting( + SequencedSkyframeExecutor.create( pkgFactory, directories, null, /* binTools -- not used */ @@ -628,7 +629,11 @@ public class LoadingPhaseRunnerTest { analysisMock.getSkyFunctions(), ImmutableList.<PrecomputedValue.Injected>of(), ImmutableList.<SkyValueDirtinessChecker>of(), - analysisMock.getProductName()); + PathFragment.EMPTY_FRAGMENT, + analysisMock.getProductName(), + BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, + BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); PathPackageLocator pkgLocator = PathPackageLocator.create( null, options.packagePath, storedErrors, workspace, workspace); PackageCacheOptions packageCacheOptions = Options.getDefaults(PackageCacheOptions.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 6628c5dd2f..ffc13fb01b 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 @@ -33,6 +33,7 @@ import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; +import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants; import com.google.devtools.build.lib.skyframe.DiffAwareness; import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; @@ -84,7 +85,7 @@ public class PackageCacheTest extends FoundationTestCase { packageFactoryBuilder.disableChecks(); } skyframeExecutor = - SequencedSkyframeExecutor.createForTesting( + SequencedSkyframeExecutor.create( packageFactoryBuilder.build(ruleClassProvider, scratch.getFileSystem()), directories, null, /* BinTools */ @@ -95,7 +96,11 @@ public class PackageCacheTest extends FoundationTestCase { AnalysisMock.get().getSkyFunctions(), ImmutableList.<PrecomputedValue.Injected>of(), ImmutableList.<SkyValueDirtinessChecker>of(), - analysisMock.getProductName()); + PathFragment.EMPTY_FRAGMENT, + analysisMock.getProductName(), + BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY, + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY, + BazelSkyframeExecutorConstants.ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE); setUpSkyframe(parsePackageCacheOptions(), parseSkylarkSemanticsOptions()); } |