diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-04-22 11:42:34 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-04-22 11:53:26 +0000 |
| commit | 9e4c78fb5752fa554db82815f7336255831a95ab (patch) | |
| tree | fdf498cf18c1e875fc4be3d00afb5f99583ee1a9 /third_party | |
| parent | 8ed31f05e664e925ad628ab47feeaaab30c26283 (diff) | |
Automated [] rollback of commit 857cda2c45a5cc68c3fa398311c48c571a64915d and commit 790d2f6009d47fe92cf0cd92a1473bbf0141f32e.
*** Reason for rollback ***
Broke non-Bazel projects on ci.bazel.io
Fixes #1168
*** Original change description ***
Move the runfiles for external repositories to under the x.runfiles/ directory
This also sets the Bazel workspace name to io_bazel_source.
Fixes #848.
Relevant to #1116, #1124,
RELNOTES[INC]: All repositories are now directly under the x.runfiles directory in the runfiles tree (previously, external repositories were at x.runfiles/main-repo/external/other-repo. This simplifies handling remote repository runfiles considerably, but will break existing references to external repository runfiles....
***
--
MOS_MIGRATED_REVID=120535721
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/ijar/test/BUILD | 12 | ||||
| -rwxr-xr-x | third_party/ijar/test/testenv.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD index da06173368..f8ebb2a612 100644 --- a/third_party/ijar/test/BUILD +++ b/third_party/ijar/test/BUILD @@ -9,12 +9,12 @@ sh_test( size = "enormous", srcs = ["ijar_test.sh"], args = [ - "../local_jdk/bin/javac", - "../local_jdk/bin/java", - "../local_jdk/bin/jar", - "../local_jdk/bin/javap", - "io_bazel/$(location //third_party/ijar)", - "io_bazel/$(location //tools/jdk:langtools)", + "$(JAVABASE)/bin/javac", + "$(JAVA)", + "$(JAVABASE)/bin/jar", + "$(JAVABASE)/bin/javap", + "$(location //third_party/ijar)", + "$(location //tools/jdk:langtools)", # We assume unzip and zip to be on the path "unzip", "zip", diff --git a/third_party/ijar/test/testenv.sh b/third_party/ijar/test/testenv.sh index 235f2c5948..66c4811428 100755 --- a/third_party/ijar/test/testenv.sh +++ b/third_party/ijar/test/testenv.sh @@ -20,7 +20,7 @@ [ -z "$TEST_SRCDIR" ] && { echo "TEST_SRCDIR not set!" >&2; exit 1; } # Load the unit-testing framework -source "${TEST_SRCDIR}/io_bazel/src/test/shell/unittest.bash" || \ +source "${TEST_SRCDIR}/src/test/shell/unittest.bash" || \ { echo "Failed to source unittest.bash" >&2; exit 1; } ## OSX/BSD stat and MD5 |