From 857cda2c45a5cc68c3fa398311c48c571a64915d Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Tue, 19 Apr 2016 13:55:24 +0000 Subject: 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 --- scripts/testenv.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/testenv.sh') diff --git a/scripts/testenv.sh b/scripts/testenv.sh index c45ee6a5e5..25fa4ebfd7 100755 --- a/scripts/testenv.sh +++ b/scripts/testenv.sh @@ -19,8 +19,8 @@ [ -z "$TEST_SRCDIR" ] && { echo "TEST_SRCDIR not set!" >&2; exit 1; } # Load the unit-testing framework -source "${TEST_SRCDIR}/src/test/shell/unittest.bash" || \ - { echo "Failed to source unittest.bash" >&2; exit 1; } +source "${TEST_SRCDIR}/io_bazel/src/test/shell/unittest.bash" \ + || { echo "Failed to source unittest.bash" >&2; exit 1; } set_up() { mkdir -p $TEST_TMPDIR/workspace -- cgit v1.2.3