diff options
| author |  nharmata <nharmata@google.com> | 2017-06-06 10:42:15 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-06-06 12:36:44 -0400 |
| commit | d3c59b37fa0e39c242d6bb246b0af4a88794ab17 (patch) | |
| tree | 62039c853c89067717b70e6a208686110cc612be /src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java | |
| parent | abc64dd614705b023a4b18c94e5b7df4b8d943ae (diff) | |
Factor out Bazel-specific ctor constants in SequencedSkyframeExecutor into a separate class. They're currently passed in around various callsites in the codebase and tests.
RELNOTES: None
PiperOrigin-RevId: 158139074
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java | 8 |
1 files changed, 2 insertions, 6 deletions
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 0f61da4431..f52f09d718 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 @@ -38,8 +38,6 @@ 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.DiffAwareness; -import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy; -import com.google.devtools.build.lib.skyframe.PackageLookupValue.BuildFileName; import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker; @@ -104,7 +102,7 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { new AnalysisTestUtil.DummyWorkspaceStatusActionFactory(directories); skyframeExecutor = - SequencedSkyframeExecutor.create( + SequencedSkyframeExecutor.createForTesting( pkgFactory, directories, BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()), @@ -115,9 +113,7 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { analysisMock.getSkyFunctions(), ImmutableList.<PrecomputedValue.Injected>of(), ImmutableList.<SkyValueDirtinessChecker>of(), - analysisMock.getProductName(), - CrossRepositoryLabelViolationStrategy.ERROR, - ImmutableList.of(BuildFileName.BUILD_DOT_BAZEL, BuildFileName.BUILD)); + analysisMock.getProductName()); skyframeExecutor.injectExtraPrecomputedValues(ImmutableList.of(PrecomputedValue.injected( RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, ImmutableMap.<RepositoryName, PathFragment>of()))); |