aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar Yue Gan <yueg@google.com>2016-10-12 12:09:38 +0000
committerGravatar Yue Gan <yueg@google.com>2016-10-12 12:12:25 +0000
commitf695c54a8f5f6be7adb678d305005f78e4b44424 (patch)
tree7054f8c6c618ed053941b9c300427c0ec5eb5a00 /src/test
parentd38ee63c6402819b9c01637e7176e03ad2296314 (diff)
Automated [] rollback of commit e898023ffc6c47a27312c4d3659dbeeccdb3cd37.
*** Reason for rollback *** Make darwin sandboxing default again. *** Original change description *** Fix #1849: Sandboxing on OS X should be turned off by default for 0.3.2. This restructures the way we set the default Spawn strategy so that each BlazeModule supplying a SpawnActionContext has an ActionContextConsumer that sets its own SpawnActionContext as the default, with the BazelRulesModule being put as the last module loaded in BazelMain, so that it can override that decision - it only does, if the user explicitly specifies a --spawn_strategy flag. IMHO this is a much saner approach than... *** ROLLBACK_OF=134770427 RELNOTES: Darwin sandboxing is default. -- MOS_MIGRATED_REVID=135905657
Diffstat (limited to 'src/test')
-rwxr-xr-xsrc/test/shell/bazel/bazel_sandboxing_test.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/shell/bazel/bazel_sandboxing_test.sh b/src/test/shell/bazel/bazel_sandboxing_test.sh
index 0b796683ed..a61c665655 100755
--- a/src/test/shell/bazel/bazel_sandboxing_test.sh
+++ b/src/test/shell/bazel/bazel_sandboxing_test.sh
@@ -222,7 +222,7 @@ function test_sandbox_cleanup() {
bazel build examples/genrule:tools_work &> $TEST_log \
|| fail "Hermetic genrule failed: examples/genrule:tools_work"
bazel shutdown &> $TEST_log || fail "bazel shutdown failed"
- if [[ -n "$(ls -A "$(bazel info output_base)/bazel-sandbox")" ]]; then
+ if [[ "$(ls -la "$(bazel info output_base)/bazel-sandbox")" ]]; then
fail "Build left files around afterwards"
fi
}