diff options
author | 2016-04-19 13:55:24 +0000 | |
---|---|---|
committer | 2016-04-20 11:12:35 +0000 | |
commit | 857cda2c45a5cc68c3fa398311c48c571a64915d (patch) | |
tree | 8a2ad9cd0c92752b1b6105c27d9995dcaf3d24a4 /src/test/shell/bazel/external_integration_test.sh | |
parent | 0b26f446f8312d1c43d162fe706467ef458c4db8 (diff) |
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.
---
Furthermore, if a Bazel project does not provide a workspace name in the WORKSPACE file, Bazel will now default to using __main__ as the workspace name (instead of "", as previously). The repository's runfiles will appear under x.runfiles/__main__/.
--
MOS_MIGRATED_REVID=120224534
Diffstat (limited to 'src/test/shell/bazel/external_integration_test.sh')
-rwxr-xr-x | src/test/shell/bazel/external_integration_test.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/shell/bazel/external_integration_test.sh b/src/test/shell/bazel/external_integration_test.sh index 6f3a6b03c0..e9c1bc6660 100755 --- a/src/test/shell/bazel/external_integration_test.sh +++ b/src/test/shell/bazel/external_integration_test.sh @@ -139,7 +139,7 @@ EOF cat > zoo/female.sh <<EOF #!/bin/bash -./external/endangered/fox/male +../endangered/fox/male EOF chmod +x zoo/female.sh fi @@ -422,10 +422,10 @@ EOF cat > test/test.sh <<EOF #!/bin/bash echo "symlink:" -ls -l external/toto/file +ls -l ../toto/file echo "dest:" -ls -l \$(readlink -f external/toto/file/toto) -external/toto/file/toto +ls -l \$(readlink -f ../toto/file/toto) +../toto/file/toto EOF chmod +x test/test.sh @@ -459,7 +459,7 @@ EOF cat > test/test.sh <<EOF #!/bin/bash -cat external/toto/file/toto +cat ../toto/file/toto EOF chmod +x test/test.sh @@ -581,7 +581,7 @@ EOF cat > zoo/female.sh <<EOF #!/bin/bash -cat external/endangered/fox/male +cat ../endangered/fox/male EOF chmod +x zoo/female.sh |