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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/test/shell/integration/runfiles_test.sh b/src/test/shell/integration/runfiles_test.sh
index ee26ca130c..6821b30dcd 100755
--- a/src/test/shell/integration/runfiles_test.sh
+++ b/src/test/shell/integration/runfiles_test.sh
@@ -55,16 +55,16 @@ EOF
   bazel build pkg:py >&$TEST_log 2>&1 || fail "build failed"
 
   # we get a warning that hidden.py is inaccessible
-  expect_log_once "/genfiles/pkg/e/f/g/hidden.py obscured by .*/pkg/e/f "
+  expect_log_once "/genfiles/pkg/e/f/g/hidden.py obscured by pkg/e/f "
 }
 
 function test_foo_runfiles() {
-  cat > BUILD << EOF
+cat > BUILD << EOF
 py_library(name = "root",
            srcs = ["__init__.py"],
            visibility = ["//visibility:public"])
 EOF
-  cat > pkg/BUILD << EOF
+cat > pkg/BUILD << EOF
 sh_binary(name = "foo",
           srcs = [ "x/y/z.sh" ],
           data = [ ":py",
@@ -149,3 +149,4 @@ EOF
 }
 
 run_suite "runfiles"
+