diff options
author | 2016-11-11 01:52:02 +0000 | |
---|---|---|
committer | 2016-11-11 10:05:07 +0000 | |
commit | 0c0735a12f4491a2594bde7c6ac26c1a4d5b6bd9 (patch) | |
tree | 5307a07f987cdf526b1e897d19e406b96489c715 /src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java | |
parent | 8b31ea61ae1dbfb4cf991bd5f26907b5c6e61793 (diff) |
Update package lookup to check for files named BUILD.bazel before files named
BUILD.
Fixes #552.
RELNOTES[NEW]: Packages are defined in BUILD.bazel as well as BUILD files.
--
MOS_MIGRATED_REVID=138828981
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java index cd017bec2d..e3c6a97a43 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java @@ -23,6 +23,7 @@ import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.skyframe.ActionLookupValue.ActionLookupKey; 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.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.build.lib.testutil.TestUtils; @@ -93,7 +94,10 @@ abstract class ArtifactFunctionTestCase { new PackageFunction(null, null, null, null, null, null, null)) .put( SkyFunctions.PACKAGE_LOOKUP, - new PackageLookupFunction(null, CrossRepositoryLabelViolationStrategy.ERROR)) + new PackageLookupFunction( + null, + CrossRepositoryLabelViolationStrategy.ERROR, + ImmutableList.of(BuildFileName.BUILD_DOT_BAZEL, BuildFileName.BUILD))) .put( SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(TestRuleClassProvider.getRuleClassProvider())) |