Merge pull request #395 from martin-schulze-vireso/bugfix/dont_remove…

…_preprocessed_files_with_--no-tempdir-cleanup Don't remove preprocessed files with --no-tempdir-cleanup
bats-core · Jan 22, 2021 · 2905040 · 2905040
2 parents aa6f2ca + 6c2d708
commit 2905040
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/lib/bats-core/preprocessing.bash b/lib/bats-core/preprocessing.bash
@@ -16,12 +16,6 @@ bats_preprocess_source() {
 	# since the latter runs in bats-exec-test's bash while this runs in bats-exec-file's
 	export BATS_TEST_SOURCE="${BATS_TMPNAME}.src"
 	bats-preprocess "$BATS_TEST_FILENAME" >"$BATS_TEST_SOURCE"
-	trap 'bats_cleanup_preprocessed_source' ERR EXIT
-	trap 'bats_cleanup_preprocessed_source; exit 1' INT
-}
-
-bats_cleanup_preprocessed_source() {
-	rm -f "$BATS_TEST_SOURCE"
 }
 
 bats_evaluate_preprocessed_source() {

diff --git a/libexec/bats-core/bats b/libexec/bats-core/bats
@@ -110,7 +110,7 @@ formatter_flags=('--dummy-flag') # add a dummy flag to prevent unset varialeb er
 formatter='tap'
 report_formatter=''
 recursive=
-tempdir_cleanup=1
+export BATS_TEMPDIR_CLEANUP=1
 output=
 if [[ -z "${CI:-}" && -t 0 && -t 1 ]] && command -v tput >/dev/null; then
   formatter='pretty'
@@ -184,7 +184,11 @@ while [[ "$#" -ne 0 ]]; do
     flags+=("--no-parallelize-within-files")
     ;;
   --no-tempdir-cleanup)
-    tempdir_cleanup=''
+    BATS_TEMPDIR_CLEANUP=''
+    ;;
+  --tempdir) # for internal test consumption only!
+    BATS_RUN_TMPDIR="$2"
+    shift
     ;;
   -*)
     abort "Bad command line option '$1'"
@@ -202,7 +206,7 @@ if [[ -d "$BATS_RUN_TMPDIR" ]]; then
   exit 1
 fi
 mkdir -p "$BATS_RUN_TMPDIR"
-if [[ -n "$tempdir_cleanup" ]]; then
+if [[ -n "$BATS_TEMPDIR_CLEANUP" ]]; then
   trap 'rm -rf "$BATS_RUN_TMPDIR"' ERR EXIT
 fi
 

diff --git a/libexec/bats-core/bats-exec-file b/libexec/bats-core/bats-exec-file
@@ -128,7 +128,6 @@ bats_file_exit_trap() {
     rm -rf "$BATS_OUT"
     status=1
   fi
-  bats_cleanup_preprocessed_source
   exit $status
 }
 

diff --git a/test/bats.bats b/test/bats.bats
@@ -717,3 +717,20 @@ END_OF_ERR_MSG
   [ "${lines[1]}" = "ok 1 a passing test" ]
   [ ${#lines[@]} = 2 ]
 }
+
+@test "run tmpdir is cleaned up by default" {
+  TEST_TMPDIR="${BATS_RUN_TMPDIR}/$BATS_TEST_NAME"
+  bats --tempdir "$TEST_TMPDIR" "$FIXTURE_ROOT/passing.bats"
+
+  [ ! -d "$TEST_TMPDIR" ]
+}
+
+@test "run tmpdir is not cleanup up with --no-cleanup-tempdir" {
+  TEST_TMPDIR="${BATS_RUN_TMPDIR}/$BATS_TEST_NAME"
+  bats --tempdir "$TEST_TMPDIR" --no-tempdir-cleanup "$FIXTURE_ROOT/passing.bats"
+
+  [ -d "$TEST_TMPDIR" ]
+
+  # should also find preprocessed files!
+  [ $(find "$TEST_TMPDIR" -name '*.src' | wc -l) -eq 1 ]
+}