diff options
author | Kristina Chodorow <kchodorow@google.com> | 2016-04-19 13:55:24 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-04-20 11:12:35 +0000 |
commit | 857cda2c45a5cc68c3fa398311c48c571a64915d (patch) | |
tree | 8a2ad9cd0c92752b1b6105c27d9995dcaf3d24a4 /src/test/shell/bazel/bazel_rules_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/bazel_rules_test.sh')
-rwxr-xr-x | src/test/shell/bazel/bazel_rules_test.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/shell/bazel/bazel_rules_test.sh b/src/test/shell/bazel/bazel_rules_test.sh index b0f7e4e312..c82b9cd996 100755 --- a/src/test/shell/bazel/bazel_rules_test.sh +++ b/src/test/shell/bazel/bazel_rules_test.sh @@ -63,7 +63,7 @@ function test_extra_action() { # a program that parses the proto here. cat > mypkg/echoer.sh <<EOF #!/bin/bash -if [[ ! -e \$0.runfiles/mypkg/runfile ]]; then +if [[ ! -e \$0.runfiles/__main__/mypkg/runfile ]]; then echo "Runfile not found" >&2 exit 1 fi @@ -357,8 +357,8 @@ def Fib(n): EOF cat > module2/bez.py <<EOF -from external.remote.module_a import foo -from external.remote.module_b import bar +from remote.module_a import foo +from remote.module_b import bar from module1 import fib print "The number is %d" % foo.GetNumber() |