diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 664ea53011..3758bdc0ac 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -63,7 +63,6 @@ import com.google.devtools.build.lib.exec.SingleBuildFileCache; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction; 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.SkyframeActionExecutor.ActionCompletedReceiver; import com.google.devtools.build.lib.skyframe.SkyframeActionExecutor.ProgressSupplier; import com.google.devtools.build.lib.testutil.FoundationTestCase; @@ -161,7 +160,11 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { final boolean keepGoing, @Nullable EvaluationProgressReceiver evaluationProgressReceiver) throws Exception { AtomicReference<PathPackageLocator> pkgLocator = - new AtomicReference<>(new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory))); + new AtomicReference<>( + new PathPackageLocator( + outputBase, + ImmutableList.of(rootDirectory), + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY)); AtomicReference<TimestampGranularityMonitor> tsgmRef = new AtomicReference<>(tsgm); BlazeDirectories directories = new BlazeDirectories( @@ -206,7 +209,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { new PackageLookupFunction( null, CrossRepositoryLabelViolationStrategy.ERROR, - ImmutableList.of(BuildFileName.BUILD_DOT_BAZEL, BuildFileName.BUILD))) + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY)) .put( SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(TestRuleClassProvider.getRuleClassProvider())) @@ -214,8 +217,11 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { SkyFunctions.WORKSPACE_FILE, new WorkspaceFileFunction( TestRuleClassProvider.getRuleClassProvider(), - TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING.builder().build( - TestRuleClassProvider.getRuleClassProvider(), scratch.getFileSystem()), + TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING + .builder() + .build( + TestRuleClassProvider.getRuleClassProvider(), + scratch.getFileSystem()), directories)) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()) .put( |