diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-03-02 19:51:23 +0000 |
|---|---|---|
| committer | Kristina Chodorow <kchodorow@google.com> | 2016-03-02 22:03:27 +0000 |
| commit | 8595e56d00836965c0175538f16df7e3e46e1354 (patch) | |
| tree | 072f6a49ed3de1b65a2c419b0ef0edb6664848ed /src/test/shell/bazel | |
| parent | e82ffaad339e8c7f0e5b7eb648d78cf8c7ab5b51 (diff) | |
Rollback of commit 37059e4ffd23fbc10828f61ab198b98c2ca7a8a9.
*** Reason for rollback ***
Breaks on Java 1.7
See http://ci.bazel.io/job/Bazel/385/.
*** Original change description ***
Canonicalize the name of the target itself for java indirect dep errors.
Otherwise it prints the wrong message when the target which is missing
a dependency is in a repository other than the default one.
--
MOS_MIGRATED_REVID=116164887
Diffstat (limited to 'src/test/shell/bazel')
| -rwxr-xr-x | src/test/shell/bazel/local_repository_test.sh | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/test/shell/bazel/local_repository_test.sh b/src/test/shell/bazel/local_repository_test.sh index de146d3aba..0546bc47b8 100755 --- a/src/test/shell/bazel/local_repository_test.sh +++ b/src/test/shell/bazel/local_repository_test.sh @@ -348,7 +348,7 @@ EOF } # Creates an indirect dependency on X from A and make sure the error message -# refers to the correct label, both in an external repository and not. +# refers to the correct label. function test_indirect_dep_message() { local external_dir=$TEST_TMPDIR/ext-dir mkdir -p a b $external_dir/x @@ -391,8 +391,6 @@ java_library( ) EOF - cp -r a b $external_dir - touch $external_dir/WORKSPACE cat > $external_dir/x/X.java <<EOF package x; @@ -420,15 +418,7 @@ EOF bazel build //a:a >& $TEST_log && fail "Building //a:a should error out" expect_log "** Please add the following dependencies:" - expect_log "@x_repo//x to //a" - - bazel build //a >& $TEST_log && fail "Building //a should error out" - expect_log "** Please add the following dependencies:" - expect_log "@x_repo//x to //a" - - bazel build @x_repo//a >& $TEST_log && fail "Building @x_repo//a should error out" - expect_log "** Please add the following dependencies:" - expect_log "@x_repo//x to @x_repo//a" + expect_log "@x_repo//x to //a:a" } function test_external_includes() { |