diff options
author | 2016-04-22 11:42:34 +0000 | |
---|---|---|
committer | 2016-04-22 11:53:26 +0000 | |
commit | 9e4c78fb5752fa554db82815f7336255831a95ab (patch) | |
tree | fdf498cf18c1e875fc4be3d00afb5f99583ee1a9 /src/test/shell/bazel/runfiles_test.sh | |
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 'src/test/shell/bazel/runfiles_test.sh')
-rwxr-xr-x | src/test/shell/bazel/runfiles_test.sh | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/src/test/shell/bazel/runfiles_test.sh b/src/test/shell/bazel/runfiles_test.sh index 698f319d59..33205b86d2 100755 --- a/src/test/shell/bazel/runfiles_test.sh +++ b/src/test/shell/bazel/runfiles_test.sh @@ -53,43 +53,4 @@ EOF [[ -x bazel-bin/foo/foo.runfiles/$name/foo/foo ]] || fail "No foo executable under $name" } -function test_external_runfiles() { - cat > WORKSPACE <<EOF -workspace(name = "foo") - -new_local_repository( - name = "bar", - path = ".", - build_file = "BUILD", -) -EOF - - cat > BUILD <<EOF -exports_files(glob(["*"])) - -cc_binary( - name = "thing", - srcs = ["thing.cc"], - data = ["@bar//:thing.cc"], -) -EOF - cat > thing.cc <<EOF -int main() { return 0; } -EOF - bazel build --legacy_external_runfiles //:thing &> $TEST_log \ - || fail "Build failed" - [[ -d bazel-bin/thing.runfiles/foo/external/bar ]] \ - || fail "bar not found" - - bazel build --nolegacy_external_runfiles //:thing &> $TEST_log \ - || fail "Build failed" - [[ ! -d bazel-bin/thing.runfiles/foo/external/bar ]] \ - || fail "Old bar still found" - - bazel build --legacy_external_runfiles //:thing &> $TEST_log \ - || fail "Build failed" - [[ -d bazel-bin/thing.runfiles/foo/external/bar ]] \ - || fail "bar not recreated" -} - run_suite "runfiles tests" |