From 5e606e6113902a5ddfe4f5e54fb72a0fd2f4c3e3 Mon Sep 17 00:00:00 2001 From: janakr Date: Wed, 19 Jul 2017 22:40:20 +0200 Subject: Reduce to one SequencedSkyframeExecutor#create method. The others were minor convenience methods that didn't (IMO) carry their weight. PiperOrigin-RevId: 162528716 --- .../com/google/devtools/build/lib/pkgcache/PackageCacheTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java') 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.of(), ImmutableList.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()); } -- cgit v1.2.3