diff options
| author |  John Cater <jcater@google.com> | 2017-11-28 20:47:41 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-28 20:49:17 -0800 |
| commit | e0d1d0ef7e1d53f232a457ac66496a5d8d9b82e3 (patch) | |
| tree | d3637b0bf3f2020638665335841bf0ba752c7a1e /src/test/java/com/google/devtools/build/lib/packages | |
| parent | 55a4b9ae3f4ac5c453e7d944c5113f7fe9baf24b (diff) | |
Update PathPackageLocator to take a list of potential build file names,
instead of assuming BUILD.
- Default the list to the same value as PackageLookupFunction:
BUILD.bazel, BUILD.
- Move BuildFileNames to the packages package, so it is more generally
available.
Part of #4056.
Change-Id: Ie12512b492cd7d47a9e56ec3bc209f829feaf4b5
PiperOrigin-RevId: 177261295
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java | 15 |
1 files changed, 12 insertions, 3 deletions
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 5a9d3f6ddd..e8077a7434 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 @@ -138,7 +138,10 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { packageCacheOptions.showLoadingProgress = true; packageCacheOptions.globbingThreads = GLOBBING_THREADS; skyframeExecutor.preparePackageLoading( - new PathPackageLocator(outputBase, ImmutableList.of(rootDirectory)), + new PathPackageLocator( + outputBase, + ImmutableList.of(rootDirectory), + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY), packageCacheOptions, Options.getDefaults(SkylarkSemanticsOptions.class), defaultsPackageContents, @@ -149,8 +152,14 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { } private void setUpSkyframe() { - PathPackageLocator pkgLocator = PathPackageLocator.create( - outputBase, packageCacheOptions.packagePath, reporter, rootDirectory, rootDirectory); + PathPackageLocator pkgLocator = + PathPackageLocator.create( + outputBase, + packageCacheOptions.packagePath, + reporter, + rootDirectory, + rootDirectory, + BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY); packageCacheOptions.showLoadingProgress = true; packageCacheOptions.globbingThreads = GLOBBING_THREADS; skyframeExecutor.preparePackageLoading( |