aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/shell/integration
diff options
context:
space:
mode:
authorGravatar Yue Gan <yueg@google.com>2016-09-07 09:55:05 +0000
committerGravatar Yue Gan <yueg@google.com>2016-09-07 10:44:31 +0000
commit27bb97805da8bc43c54ad80a916e0d20b370373e (patch)
tree01291c098bd744728ca3ca819560a2f275339c00 /src/test/shell/integration
parent0474511201b66ba5b456f90c5e4beb7b1a1ef00f (diff)
Fixes breakage on CI with "sandbox-exec: external/bazel_tools/tools/cpp/osx_cc_wrapper.sh: No such file or directory"
-- MOS_MIGRATED_REVID=132415409
Diffstat (limited to 'src/test/shell/integration')
-rw-r--r--src/test/shell/integration/BUILD1
-rwxr-xr-xsrc/test/shell/integration/loading_phase_tests.sh2
-rwxr-xr-xsrc/test/shell/integration/testenv.sh2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD
index 613ed750fc..c9135a251e 100644
--- a/src/test/shell/integration/BUILD
+++ b/src/test/shell/integration/BUILD
@@ -20,6 +20,7 @@ sh_test(
size = "medium",
srcs = ["runfiles_test.sh"],
data = [":test-deps"],
+ tags = ["local"],
)
sh_test(
diff --git a/src/test/shell/integration/loading_phase_tests.sh b/src/test/shell/integration/loading_phase_tests.sh
index 9e0158614e..b9d10dd23d 100755
--- a/src/test/shell/integration/loading_phase_tests.sh
+++ b/src/test/shell/integration/loading_phase_tests.sh
@@ -24,6 +24,8 @@ source $(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/testenv.sh \
create_and_cd_client
put_bazel_on_path
+# Our tests use the static crosstool, so make it the default.
+EXTRA_BAZELRC="build --crosstool_top=@bazel_tools//tools/cpp:default-toolchain"
write_default_bazelrc
output_base=$TEST_TMPDIR/out
diff --git a/src/test/shell/integration/testenv.sh b/src/test/shell/integration/testenv.sh
index f0c37a7b5a..344c119628 100755
--- a/src/test/shell/integration/testenv.sh
+++ b/src/test/shell/integration/testenv.sh
@@ -33,8 +33,6 @@ function put_bazel_on_path() {
}
function write_default_bazelrc() {
- # Our tests use the static crosstool, so make it the default.
- EXTRA_BAZELRC="build --crosstool_top=@bazel_tools//tools/cpp:default-toolchain"
setup_bazelrc
}