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/bazel_example_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_example_test.sh')
-rwxr-xr-x | src/test/shell/bazel/bazel_example_test.sh | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/test/shell/bazel/bazel_example_test.sh b/src/test/shell/bazel/bazel_example_test.sh index b9d2aef276..93075fddb6 100755 --- a/src/test/shell/bazel/bazel_example_test.sh +++ b/src/test/shell/bazel/bazel_example_test.sh @@ -23,6 +23,9 @@ source $(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/test-setup.sh \ function set_up() { copy_examples + cat > WORKSPACE <<EOF +workspace(name = "io_bazel") +EOF } # @@ -77,20 +80,6 @@ function test_java_test_with_junitrunner() { assert_test_ok "${java_native_tests}:custom_with_test_class" } -function test_java_test_with_workspace_name() { - local java_pkg=examples/java-native/src/main/java/com/example/myproject - # Use named workspace and test if we can still execute hello-world - bazel clean - - rm -f WORKSPACE - cat >WORKSPACE <<'EOF' -workspace(name = "toto") -EOF - - assert_build_output ./bazel-bin/${java_pkg}/hello-world ${java_pkg}:hello-world - assert_binary_run_from_subdir "bazel-bin/${java_pkg}/hello-world foo" "Hello foo" -} - function test_genrule_and_genquery() { # The --javabase flag is to force the tools/jdk:jdk label to be used # so it appears in the dependency list. |