diff options
| -rw-r--r-- | WORKSPACE | 6 | ||||
| -rw-r--r-- | src/test/shell/bazel/BUILD | 5 | ||||
| -rwxr-xr-x | src/test/shell/bazel/bazel_sandboxing_test.sh | 5 |
3 files changed, 12 insertions, 4 deletions
@@ -145,3 +145,9 @@ http_archive( strip_prefix = "re2-2017-08-01", sha256 = "938723dc197125392698c5fcf41acb74877866ff140b81fd50b7314bf26f1636", ) + +# For src/test/shell/bazel:bazel_sandboxing_test +http_file( + name = 'mount_path_toolchain', + url = 'https://asci-toolchain.appspot.com.storage.googleapis.com/toolchain-testing/mount_path_toolchain.tar.gz', +) diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index c1f4befba7..0e0e821410 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -386,7 +386,10 @@ sh_test( name = "bazel_sandboxing_test", size = "large", srcs = ["bazel_sandboxing_test.sh"], - data = [":test-deps"], + data = [ + ":test-deps", + "@mount_path_toolchain//file", + ], tags = ["local"], ) diff --git a/src/test/shell/bazel/bazel_sandboxing_test.sh b/src/test/shell/bazel/bazel_sandboxing_test.sh index 6dd875f525..04da8cb545 100755 --- a/src/test/shell/bazel/bazel_sandboxing_test.sh +++ b/src/test/shell/bazel/bazel_sandboxing_test.sh @@ -579,10 +579,9 @@ EOF target_folder="${target_root}/x86_64-unknown-linux-gnu/sysroot/lib64" target="${target_folder}/ld-2.19.so" - # Download the toolchain package and unpack it. - wget -q https://asci-toolchain.appspot.com.storage.googleapis.com/toolchain-testing/mount_path_toolchain.tar.gz + # Unpack the toolchain. mkdir downloaded_toolchain - tar -xf mount_path_toolchain.tar.gz -C ./downloaded_toolchain + tar -xf ${TEST_SRCDIR}/mount_path_toolchain/file/mount_path_toolchain.tar.gz -C ./downloaded_toolchain chmod -R 0755 downloaded_toolchain # Replace the target_root_placeholder with the actual target_root |