Prepare our tests that can't run under sandboxing to explicitly request a non-sandboxing spawn strategy (this is a no-op until sandboxing is there).

--
MOS_MIGRATED_REVID=101219854

1 files changed, 9 insertions, 3 deletions

diff --git a/src/test/shell/bazel/bazel_test_test.sh b/src/test/shell/bazel/bazel_test_test.sh
index e186db3bdd..cff51b55f2 100755
--- a/src/test/shell/bazel/bazel_test_test.sh
+++ b/src/test/shell/bazel/bazel_test_test.sh
@@ -65,22 +65,28 @@ sh_test(
 EOF
 }
 
+# We have to use --spawn_strategy=standalone, because the test actions
+# communicate with each other via a hard-linked file.
 function test_3_cpus() {
   set_up_jobcount
   # 3 CPUs, so no more than 3 tests in parallel.
-  bazel test --test_output=errors --local_resources=10000,3,100  --runs_per_test=10 //dir:test
+  bazel test --spawn_strategy=standalone --test_output=errors \
+    --local_resources=10000,3,100  --runs_per_test=10 //dir:test
 }
 
 function test_3_local_jobs() {
   set_up_jobcount
   # 3 local test jobs, so no more than 3 tests in parallel.
-  bazel test --test_output=errors --local_test_jobs=3 --local_resources=10000,10,100 --runs_per_test=10 //dir:test
+  bazel test --spawn_strategy=standalone --test_output=errors \
+    --local_test_jobs=3 --local_resources=10000,10,100 \
+    --runs_per_test=10 //dir:test
 }
 
 function test_unlimited_local_jobs() {
   set_up_jobcount
   # unlimited local test jobs, so local resources enforces 3 tests in parallel.
-  bazel test --test_output=errors --local_resources=10000,3,100 --runs_per_test=10 //dir:test
+  bazel test --spawn_strategy=standalone --test_output=errors \
+    --local_resources=10000,3,100 --runs_per_test=10 //dir:test
 }
 
 function test_tmpdir() {