diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java | 2 | ||||
| -rwxr-xr-x | src/test/shell/bazel/local_repository_test.sh | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java index 2fa79b68a2..78231f9d8c 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/query2/output/OutputFormatter.java @@ -331,7 +331,7 @@ public abstract class OutputFormatter implements Serializable { public void processOutput(Iterable<Target> partialResult) { for (Target target : partialResult) { - packageNames.add(target.getLabel().getPackageName()); + packageNames.add(target.getPackage().getPackageIdentifier().toString()); } } diff --git a/src/test/shell/bazel/local_repository_test.sh b/src/test/shell/bazel/local_repository_test.sh index bc3a08a46e..6e9e8538f7 100755 --- a/src/test/shell/bazel/local_repository_test.sh +++ b/src/test/shell/bazel/local_repository_test.sh @@ -427,6 +427,17 @@ EOF expect_log "//external:my_repo" } +function test_repository_package_query() { + mkdir a b b/b + echo "local_repository(name='b', path='b')" > WORKSPACE + echo "sh_library(name='a', deps=['@b//b'])" > a/BUILD + touch b/WORKSPACE + echo "sh_library(name='b')" > b/b/BUILD + bazel query --output package "deps(//a)" >& $TEST_log || fail "query failed" + expect_log "a" + expect_log "@b//b" +} + function test_warning() { local bar=$TEST_TMPDIR/bar rm -rf "$bar" |