From 5845238da44989e2064eee06c52ea541c4069963 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Wed, 17 Apr 2024 02:43:38 -0700
Subject: [PATCH] Clean up test setup for sandboxing tests

Sandboxing tests should always run with Bazel defaults, which include no tmpfs path.

Work towards #21215

Closes #22002.

PiperOrigin-RevId: 625615279
Change-Id: If4146f04effeaabc1eb22d38cc5ac32247759c8c
---
 src/test/shell/bazel/bazel_sandboxing_test.sh | 15 +++------------
 src/test/shell/integration/sandboxing_test.sh |  7 +++----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/test/shell/bazel/bazel_sandboxing_test.sh b/src/test/shell/bazel/bazel_sandboxing_test.sh
index 91611c20570965..cbe0c7fa3cec60 100755
--- a/src/test/shell/bazel/bazel_sandboxing_test.sh
+++ b/src/test/shell/bazel/bazel_sandboxing_test.sh
@@ -27,6 +27,9 @@ source ${CURRENT_DIR}/../sandboxing_test_utils.sh \
 function set_up {
   add_to_bazelrc "build --spawn_strategy=sandboxed"
   add_to_bazelrc "build --genrule_strategy=sandboxed"
+
+  # Enabled in testenv.sh.tmpl, but not in Bazel by default.
+  sed -i.bak '/sandbox_tmpfs_path/d' "$bazelrc"
 }
 
 function test_sandboxed_tooldir() {
@@ -314,8 +317,6 @@ function test_add_mount_pair_tmp_source() {
 
   create_workspace_with_default_repos WORKSPACE
 
-  sed -i.bak '/sandbox_tmpfs_path/d' $TEST_TMPDIR/bazelrc
-
   local mounted=$(mktemp -d "/tmp/bazel_mounted.XXXXXXXX")
   trap "rm -fr $mounted" EXIT
   echo GOOD > "$mounted/data.txt"
@@ -343,8 +344,6 @@ function test_add_mount_pair_tmp_target() {
 
   create_workspace_with_default_repos WORKSPACE
 
-  sed -i.bak '/sandbox_tmpfs_path/d' $TEST_TMPDIR/bazelrc
-
   local source_dir=$(mktemp -d "/tmp/bazel_mounted.XXXXXXXX")
   trap "rm -fr $source_dir" EXIT
   echo BAD > "$source_dir/data.txt"
@@ -373,8 +372,6 @@ function test_add_mount_pair_tmp_target_and_source() {
 
   create_workspace_with_default_repos WORKSPACE
 
-  sed -i.bak '/sandbox_tmpfs_path/d' $TEST_TMPDIR/bazelrc
-
   local mounted=$(mktemp -d "/tmp/bazel_mounted.XXXXXXXX")
   trap "rm -fr $mounted" EXIT
   echo GOOD > "$mounted/data.txt"
@@ -405,8 +402,6 @@ function test_symlink_with_output_base_under_tmp() {
 
   create_workspace_with_default_repos WORKSPACE
 
-  sed -i.bak '/sandbox_tmpfs_path/d' $TEST_TMPDIR/bazelrc
-
   mkdir -p pkg
   cat > pkg/BUILD <<'EOF'
 load(":r.bzl", "symlink_rule")
@@ -443,8 +438,6 @@ function test_symlink_to_directory_with_output_base_under_tmp() {
 
   create_workspace_with_default_repos WORKSPACE
 
-  sed -i.bak '/sandbox_tmpfs_path/d' $TEST_TMPDIR/bazelrc
-
   mkdir -p pkg
   cat > pkg/BUILD <<'EOF'
 load(":r.bzl", "symlink_rule", "tree_rule")
@@ -494,8 +487,6 @@ function test_tmpfs_path_under_tmp() {
 
   create_workspace_with_default_repos WORKSPACE
 
-  sed -i.bak '/sandbox_tmpfs_path/d' $TEST_TMPDIR/bazelrc
-
   local tmp_file=$(mktemp "/tmp/bazel_tmp.XXXXXXXX")
   trap "rm $tmp_file" EXIT
   echo BAD > "$tmp_file"
diff --git a/src/test/shell/integration/sandboxing_test.sh b/src/test/shell/integration/sandboxing_test.sh
index 824649b431bbeb..d63745cfa8f3df 100755
--- a/src/test/shell/integration/sandboxing_test.sh
+++ b/src/test/shell/integration/sandboxing_test.sh
@@ -29,6 +29,9 @@ disable_bzlmod
 function set_up() {
   add_to_bazelrc "build --spawn_strategy=sandboxed"
   add_to_bazelrc "build --genrule_strategy=sandboxed"
+
+  # Enabled in testenv.sh.tmpl, but not in Bazel by default.
+  sed -i.bak '/sandbox_tmpfs_path/d' "$bazelrc"
 }
 
 function tear_down() {
@@ -693,7 +696,6 @@ EOF
 }
 
 function test_read_non_hermetic_tmp {
-  sed -i.bak '/sandbox_tmpfs_path/d' "$bazelrc"
   temp_dir=$(mktemp -d /tmp/test.XXXXXX)
   trap 'rm -rf ${temp_dir}' EXIT
 
@@ -748,7 +750,6 @@ function test_read_hermetic_tmp_user_override {
     echo "Skipping test: --incompatible_sandbox_hermetic_tmp is only supported in Linux" 1>&2
     return 0
   fi
-  sed -i.bak '/sandbox_tmpfs_path/d' "$bazelrc"
 
   temp_dir=$(mktemp -d /tmp/test.XXXXXX)
   trap 'rm -rf ${temp_dir}' EXIT
@@ -772,7 +773,6 @@ EOF
 }
 
 function test_write_non_hermetic_tmp {
-  sed -i.bak '/sandbox_tmpfs_path/d' "$bazelrc"
   temp_dir=$(mktemp -d /tmp/test.XXXXXX)
   trap 'rm -rf ${temp_dir}' EXIT
 
@@ -828,7 +828,6 @@ function test_write_hermetic_tmp_user_override {
     echo "Skipping test: --incompatible_sandbox_hermetic_tmp is only supported in Linux" 1>&2
     return 0
   fi
-  sed -i.bak '/sandbox_tmpfs_path/d' "$bazelrc"
 
   temp_dir=$(mktemp -d /tmp/test.XXXXXX)
   trap 'rm -rf ${temp_dir}' EXIT