From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 20 May 2008 02:20:30 +0000 (+0000)
Subject: Made all the tests respect the PSPP_TEST_NO_CLEANUP environment variable.
X-Git-Tag: sav-api~1014
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af4066391f20365e210460a736b1b02efe194da6;p=pspp

Made all the tests respect the PSPP_TEST_NO_CLEANUP environment variable.
---

diff --git a/tests/bugs/agg-crash-2.sh b/tests/bugs/agg-crash-2.sh
index cdb94cdc2d..0b006780f3 100755
--- a/tests/bugs/agg-crash-2.sh
+++ b/tests/bugs/agg-crash-2.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/agg_crash.sh b/tests/bugs/agg_crash.sh
index cc0bad23ce..43fd9f8c47 100755
--- a/tests/bugs/agg_crash.sh
+++ b/tests/bugs/agg_crash.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/alpha-freq.sh b/tests/bugs/alpha-freq.sh
index 49d9fe25a3..ae60e79ce4 100755
--- a/tests/bugs/alpha-freq.sh
+++ b/tests/bugs/alpha-freq.sh
@@ -23,6 +23,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/big-input-2.sh b/tests/bugs/big-input-2.sh
index ecc0946868..b0da13bbf3 100755
--- a/tests/bugs/big-input-2.sh
+++ b/tests/bugs/big-input-2.sh
@@ -24,6 +24,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/big-input.sh b/tests/bugs/big-input.sh
index 8cec3c6196..3c9365dfce 100755
--- a/tests/bugs/big-input.sh
+++ b/tests/bugs/big-input.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/case-map.sh b/tests/bugs/case-map.sh
index ab9971f0f3..011c344d05 100755
--- a/tests/bugs/case-map.sh
+++ b/tests/bugs/case-map.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/comment-at-eof.sh b/tests/bugs/comment-at-eof.sh
index 6122e66051..342f9bc08a 100755
--- a/tests/bugs/comment-at-eof.sh
+++ b/tests/bugs/comment-at-eof.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/compute-fmt.sh b/tests/bugs/compute-fmt.sh
index 1d898dba19..0d4a313e26 100755
--- a/tests/bugs/compute-fmt.sh
+++ b/tests/bugs/compute-fmt.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/compute-lv.sh b/tests/bugs/compute-lv.sh
index 8b7f7fd18c..b0baf4f09c 100755
--- a/tests/bugs/compute-lv.sh
+++ b/tests/bugs/compute-lv.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/compute-sum.sh b/tests/bugs/compute-sum.sh
index 846ef79e58..83aeae048a 100755
--- a/tests/bugs/compute-sum.sh
+++ b/tests/bugs/compute-sum.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/computebug.sh b/tests/bugs/computebug.sh
index 08077e57a8..dfa5990a75 100755
--- a/tests/bugs/computebug.sh
+++ b/tests/bugs/computebug.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/crosstabs-crash.sh b/tests/bugs/crosstabs-crash.sh
index 0531094a13..99ec07cac2 100755
--- a/tests/bugs/crosstabs-crash.sh
+++ b/tests/bugs/crosstabs-crash.sh
@@ -23,6 +23,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/crosstabs-crash2.sh b/tests/bugs/crosstabs-crash2.sh
index 043aff878f..5866d0e58c 100755
--- a/tests/bugs/crosstabs-crash2.sh
+++ b/tests/bugs/crosstabs-crash2.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/crosstabs.sh b/tests/bugs/crosstabs.sh
index 818682d730..3ef691f376 100755
--- a/tests/bugs/crosstabs.sh
+++ b/tests/bugs/crosstabs.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/curtailed.sh b/tests/bugs/curtailed.sh
index 9c46e9ffcd..26de22b239 100755
--- a/tests/bugs/curtailed.sh
+++ b/tests/bugs/curtailed.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/data-crash.sh b/tests/bugs/data-crash.sh
index 1cf5d79450..dfdcbfdc60 100755
--- a/tests/bugs/data-crash.sh
+++ b/tests/bugs/data-crash.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/double-frequency.sh b/tests/bugs/double-frequency.sh
index 1c9405e876..ca958cd1ea 100755
--- a/tests/bugs/double-frequency.sh
+++ b/tests/bugs/double-frequency.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/empty-do-repeat.sh b/tests/bugs/empty-do-repeat.sh
index 9829230d09..b96b2feab2 100755
--- a/tests/bugs/empty-do-repeat.sh
+++ b/tests/bugs/empty-do-repeat.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/examine-1sample.sh b/tests/bugs/examine-1sample.sh
index 8fe628f545..49ce086c59 100755
--- a/tests/bugs/examine-1sample.sh
+++ b/tests/bugs/examine-1sample.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/examine-missing.sh b/tests/bugs/examine-missing.sh
index a2e79cecf7..5e3edec3da 100755
--- a/tests/bugs/examine-missing.sh
+++ b/tests/bugs/examine-missing.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/get-no-file.sh b/tests/bugs/get-no-file.sh
index 5e4de67a7f..d047b76758 100755
--- a/tests/bugs/get-no-file.sh
+++ b/tests/bugs/get-no-file.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/get.sh b/tests/bugs/get.sh
index 1ab18044b3..2cc6cfc5a3 100755
--- a/tests/bugs/get.sh
+++ b/tests/bugs/get.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/html-frequency.sh b/tests/bugs/html-frequency.sh
index 8fda143985..789fe32c74 100755
--- a/tests/bugs/html-frequency.sh
+++ b/tests/bugs/html-frequency.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/if_crash.sh b/tests/bugs/if_crash.sh
index bda4a73c6c..4f07d30281 100755
--- a/tests/bugs/if_crash.sh
+++ b/tests/bugs/if_crash.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/keep-all.sh b/tests/bugs/keep-all.sh
index 1450889ffb..f64674ded9 100755
--- a/tests/bugs/keep-all.sh
+++ b/tests/bugs/keep-all.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/lag_crash.sh b/tests/bugs/lag_crash.sh
index 87a411ad0d..73bce14723 100755
--- a/tests/bugs/lag_crash.sh
+++ b/tests/bugs/lag_crash.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/match-files-scratch.sh b/tests/bugs/match-files-scratch.sh
index 4830ddd359..dd95c2c077 100755
--- a/tests/bugs/match-files-scratch.sh
+++ b/tests/bugs/match-files-scratch.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/multipass.sh b/tests/bugs/multipass.sh
index 24b3a5ed8c..620d42f891 100755
--- a/tests/bugs/multipass.sh
+++ b/tests/bugs/multipass.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/overwrite-input-file.sh b/tests/bugs/overwrite-input-file.sh
index 8c1fecddbb..d9f3e59cb5 100755
--- a/tests/bugs/overwrite-input-file.sh
+++ b/tests/bugs/overwrite-input-file.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/overwrite-special-file.sh b/tests/bugs/overwrite-special-file.sh
index c23a8d4a85..2bac441301 100755
--- a/tests/bugs/overwrite-special-file.sh
+++ b/tests/bugs/overwrite-special-file.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/random.sh b/tests/bugs/random.sh
index c41dbf0050..e423f3e8b4 100755
--- a/tests/bugs/random.sh
+++ b/tests/bugs/random.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/recode-copy-bug.sh b/tests/bugs/recode-copy-bug.sh
index 9ba32baa46..912590a34c 100755
--- a/tests/bugs/recode-copy-bug.sh
+++ b/tests/bugs/recode-copy-bug.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/t-test-alpha.sh b/tests/bugs/t-test-alpha.sh
index 663889138b..ae7ebf135f 100755
--- a/tests/bugs/t-test-alpha.sh
+++ b/tests/bugs/t-test-alpha.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/t-test-alpha2.sh b/tests/bugs/t-test-alpha2.sh
index b1450d182f..c49103a882 100755
--- a/tests/bugs/t-test-alpha2.sh
+++ b/tests/bugs/t-test-alpha2.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/t-test-with-temp.sh b/tests/bugs/t-test-with-temp.sh
index 7882d8a587..92dc3fb02b 100755
--- a/tests/bugs/t-test-with-temp.sh
+++ b/tests/bugs/t-test-with-temp.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/t-test.sh b/tests/bugs/t-test.sh
index 6386ac2c99..e8c43ebca0 100755
--- a/tests/bugs/t-test.sh
+++ b/tests/bugs/t-test.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/temp-freq.sh b/tests/bugs/temp-freq.sh
index 64f12ee9aa..8e0e2c7a1f 100755
--- a/tests/bugs/temp-freq.sh
+++ b/tests/bugs/temp-freq.sh
@@ -24,6 +24,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/temporary.sh b/tests/bugs/temporary.sh
index d2091669a9..8ffa861159 100755
--- a/tests/bugs/temporary.sh
+++ b/tests/bugs/temporary.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/unwritable-dir.sh b/tests/bugs/unwritable-dir.sh
index 705c45b91e..774b6230b6 100755
--- a/tests/bugs/unwritable-dir.sh
+++ b/tests/bugs/unwritable-dir.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      chmod u+w $TEMPDIR
      rm -rf $TEMPDIR
diff --git a/tests/bugs/val-labs-trailing-slash.sh b/tests/bugs/val-labs-trailing-slash.sh
index a014aa7feb..7388caaa24 100755
--- a/tests/bugs/val-labs-trailing-slash.sh
+++ b/tests/bugs/val-labs-trailing-slash.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/bugs/val-labs.sh b/tests/bugs/val-labs.sh
index c287bde804..4d57f661e7 100755
--- a/tests/bugs/val-labs.sh
+++ b/tests/bugs/val-labs.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh
index 8fca96fab0..0992e45bce 100755
--- a/tests/command/aggregate.sh
+++ b/tests/command/aggregate.sh
@@ -19,6 +19,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh
index 47e00239ac..e956fcfa04 100755
--- a/tests/command/autorecod.sh
+++ b/tests/command/autorecod.sh
@@ -23,6 +23,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/beg-data.sh b/tests/command/beg-data.sh
index 9071a47536..6d835015e7 100755
--- a/tests/command/beg-data.sh
+++ b/tests/command/beg-data.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/bignum.sh b/tests/command/bignum.sh
index e508191814..41e1963c17 100755
--- a/tests/command/bignum.sh
+++ b/tests/command/bignum.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/count.sh b/tests/command/count.sh
index 7c70fa2113..0813c428aa 100755
--- a/tests/command/count.sh
+++ b/tests/command/count.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/data-list.sh b/tests/command/data-list.sh
index fbad9c80d5..7d3890c343 100755
--- a/tests/command/data-list.sh
+++ b/tests/command/data-list.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/datasheet.sh b/tests/command/datasheet.sh
index 475e008579..2ad30d734b 100755
--- a/tests/command/datasheet.sh
+++ b/tests/command/datasheet.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/do-if.sh b/tests/command/do-if.sh
index 185dc4e4fc..8cb6b82401 100755
--- a/tests/command/do-if.sh
+++ b/tests/command/do-if.sh
@@ -21,8 +21,12 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
-     #rm -rf $TEMPDIR
+     rm -rf $TEMPDIR
 }
 
 
diff --git a/tests/command/do-repeat.sh b/tests/command/do-repeat.sh
index 3f37618a65..0f395422f5 100755
--- a/tests/command/do-repeat.sh
+++ b/tests/command/do-repeat.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/erase.sh b/tests/command/erase.sh
index 0599bed315..491f79aa3b 100755
--- a/tests/command/erase.sh
+++ b/tests/command/erase.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh
index feb052c430..fc648313b4 100755
--- a/tests/command/examine-extremes.sh
+++ b/tests/command/examine-extremes.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/examine-percentiles.sh b/tests/command/examine-percentiles.sh
index 8638d1ade6..708e5342b2 100755
--- a/tests/command/examine-percentiles.sh
+++ b/tests/command/examine-percentiles.sh
@@ -25,6 +25,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/examine.sh b/tests/command/examine.sh
index 4f710f5bb8..d63c258709 100755
--- a/tests/command/examine.sh
+++ b/tests/command/examine.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/file-handle.sh b/tests/command/file-handle.sh
index b41c5a5405..3dfe52f10b 100755
--- a/tests/command/file-handle.sh
+++ b/tests/command/file-handle.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh
index 4b6ab0e622..e6211b4d4b 100755
--- a/tests/command/file-label.sh
+++ b/tests/command/file-label.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/filter.sh b/tests/command/filter.sh
index 40729c85ed..ec76fba9f0 100755
--- a/tests/command/filter.sh
+++ b/tests/command/filter.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/flip.sh b/tests/command/flip.sh
index dc2b177014..a3e5caf2c8 100755
--- a/tests/command/flip.sh
+++ b/tests/command/flip.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/get-data-txt-examples.sh b/tests/command/get-data-txt-examples.sh
index d9fab7505e..c601b50672 100755
--- a/tests/command/get-data-txt-examples.sh
+++ b/tests/command/get-data-txt-examples.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/get-data-txt-importcases.sh b/tests/command/get-data-txt-importcases.sh
index 40cdc62185..1c7b7cefca 100755
--- a/tests/command/get-data-txt-importcases.sh
+++ b/tests/command/get-data-txt-importcases.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/get-data-txt.sh b/tests/command/get-data-txt.sh
index 68ee637d0f..2bd0346b52 100755
--- a/tests/command/get-data-txt.sh
+++ b/tests/command/get-data-txt.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/import-export.sh b/tests/command/import-export.sh
index 67fc8d2ab7..f0c2b5c479 100755
--- a/tests/command/import-export.sh
+++ b/tests/command/import-export.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/input-program.sh b/tests/command/input-program.sh
index 0d7d95ca2b..a6e8c7784a 100755
--- a/tests/command/input-program.sh
+++ b/tests/command/input-program.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/lag.sh b/tests/command/lag.sh
index 68f4f9c793..bc14e1a93d 100755
--- a/tests/command/lag.sh
+++ b/tests/command/lag.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/list.sh b/tests/command/list.sh
index ab95a0b35f..504314a960 100755
--- a/tests/command/list.sh
+++ b/tests/command/list.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/longvars.sh b/tests/command/longvars.sh
index 184be56520..2a75f64b5e 100755
--- a/tests/command/longvars.sh
+++ b/tests/command/longvars.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/loop.sh b/tests/command/loop.sh
index d8f930c8b5..813777f4ac 100755
--- a/tests/command/loop.sh
+++ b/tests/command/loop.sh
@@ -23,6 +23,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/match-files.sh b/tests/command/match-files.sh
index bb4107e58f..965539c881 100755
--- a/tests/command/match-files.sh
+++ b/tests/command/match-files.sh
@@ -21,9 +21,12 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
     cd /
     rm -rf $TEMPDIR
-    :
 }
 
 
diff --git a/tests/command/missing-values.sh b/tests/command/missing-values.sh
index 4b1e0eb4e7..6641b520b9 100755
--- a/tests/command/missing-values.sh
+++ b/tests/command/missing-values.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/oneway-missing.sh b/tests/command/oneway-missing.sh
index ec3634ca70..2b16368b12 100755
--- a/tests/command/oneway-missing.sh
+++ b/tests/command/oneway-missing.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/permissions.sh b/tests/command/permissions.sh
index 359efa1006..db54cd5ade 100755
--- a/tests/command/permissions.sh
+++ b/tests/command/permissions.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/print.sh b/tests/command/print.sh
index c5de1e9fe6..4a0527588d 100755
--- a/tests/command/print.sh
+++ b/tests/command/print.sh
@@ -37,6 +37,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/rename.sh b/tests/command/rename.sh
index 2837223ed6..ff46486a3f 100755
--- a/tests/command/rename.sh
+++ b/tests/command/rename.sh
@@ -22,6 +22,10 @@ PSPP=$top_builddir/src/ui/terminal/pspp
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/sample.sh b/tests/command/sample.sh
index 6ba6646bc1..4f4515e2be 100755
--- a/tests/command/sample.sh
+++ b/tests/command/sample.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/sort.sh b/tests/command/sort.sh
index c3c96a3545..d66681be7b 100755
--- a/tests/command/sort.sh
+++ b/tests/command/sort.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh
index 60b4d3a557..eb2c991c1e 100755
--- a/tests/command/split-file.sh
+++ b/tests/command/split-file.sh
@@ -23,6 +23,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/sysfiles-old.sh b/tests/command/sysfiles-old.sh
index 4b2c8cd40d..df16690b01 100755
--- a/tests/command/sysfiles-old.sh
+++ b/tests/command/sysfiles-old.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh
index 2bfd6a5b03..d4f59052de 100755
--- a/tests/command/sysfiles.sh
+++ b/tests/command/sysfiles.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/t-test-1-indep-val.sh b/tests/command/t-test-1-indep-val.sh
index 2490490130..5f4a5c1765 100755
--- a/tests/command/t-test-1-indep-val.sh
+++ b/tests/command/t-test-1-indep-val.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/t-test-1-sample-missing-anal.sh b/tests/command/t-test-1-sample-missing-anal.sh
index 51ec1dc132..4cc2effa5b 100755
--- a/tests/command/t-test-1-sample-missing-anal.sh
+++ b/tests/command/t-test-1-sample-missing-anal.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/t-test-1-sample-missing-list.sh b/tests/command/t-test-1-sample-missing-list.sh
index 8d63a3e20d..0747148486 100755
--- a/tests/command/t-test-1-sample-missing-list.sh
+++ b/tests/command/t-test-1-sample-missing-list.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/t-test-1s.sh b/tests/command/t-test-1s.sh
index bf421bd45d..4019865b52 100755
--- a/tests/command/t-test-1s.sh
+++ b/tests/command/t-test-1s.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/t-test-groups.sh b/tests/command/t-test-groups.sh
index 05cc1835fe..53080bdf8b 100755
--- a/tests/command/t-test-groups.sh
+++ b/tests/command/t-test-groups.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/t-test-indep-missing-anal.sh b/tests/command/t-test-indep-missing-anal.sh
index 181c73b6bd..fd307ff339 100755
--- a/tests/command/t-test-indep-missing-anal.sh
+++ b/tests/command/t-test-indep-missing-anal.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/t-test-indep-missing-list.sh b/tests/command/t-test-indep-missing-list.sh
index 2c7114f1bf..2e62b4d2fb 100755
--- a/tests/command/t-test-indep-missing-list.sh
+++ b/tests/command/t-test-indep-missing-list.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/t-test-paired-missing-anal.sh b/tests/command/t-test-paired-missing-anal.sh
index 533dfa4930..a747d4fddc 100755
--- a/tests/command/t-test-paired-missing-anal.sh
+++ b/tests/command/t-test-paired-missing-anal.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/t-test-paired-missing-list.sh b/tests/command/t-test-paired-missing-list.sh
index 4317a574a7..0f96be4e2b 100755
--- a/tests/command/t-test-paired-missing-list.sh
+++ b/tests/command/t-test-paired-missing-list.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh
index f657e8fb2c..2594623612 100755
--- a/tests/command/t-test-pairs.sh
+++ b/tests/command/t-test-pairs.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/tabs.sh b/tests/command/tabs.sh
index c6d968b188..ad530f45c8 100755
--- a/tests/command/tabs.sh
+++ b/tests/command/tabs.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/trimmed-mean.sh b/tests/command/trimmed-mean.sh
index 7346e526cf..e2a5af71ae 100755
--- a/tests/command/trimmed-mean.sh
+++ b/tests/command/trimmed-mean.sh
@@ -24,6 +24,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/use.sh b/tests/command/use.sh
index f81b226412..18b66f0f15 100755
--- a/tests/command/use.sh
+++ b/tests/command/use.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/variable-display.sh b/tests/command/variable-display.sh
index bb639d10f6..d3f6802453 100755
--- a/tests/command/variable-display.sh
+++ b/tests/command/variable-display.sh
@@ -21,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/vector.sh b/tests/command/vector.sh
index 94c0c4693c..e99fab4b3a 100755
--- a/tests/command/vector.sh
+++ b/tests/command/vector.sh
@@ -23,6 +23,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/command/weight.sh b/tests/command/weight.sh
index 01bd0a318c..6d90315652 100755
--- a/tests/command/weight.sh
+++ b/tests/command/weight.sh
@@ -23,7 +23,10 @@ export LANG
 
 cleanup()
 {
-     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then return ; fi
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR"
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/expressions/epoch.sh b/tests/expressions/epoch.sh
index 27184e0812..1ceab30801 100755
--- a/tests/expressions/epoch.sh
+++ b/tests/expressions/epoch.sh
@@ -18,6 +18,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/expressions/expressions.sh b/tests/expressions/expressions.sh
index 8f55efda37..339abed4dd 100755
--- a/tests/expressions/expressions.sh
+++ b/tests/expressions/expressions.sh
@@ -19,6 +19,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/expressions/randist.sh b/tests/expressions/randist.sh
index 188e8ac315..58fe386d29 100755
--- a/tests/expressions/randist.sh
+++ b/tests/expressions/randist.sh
@@ -19,7 +19,7 @@ export STAT_CONFIG_PATH
 cleanup()
 {
      if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
-        echo NOT removing directory $TEMPDIR
+	echo "NOT cleaning $TEMPDIR" 
      	return ; 
      fi
      cd /
diff --git a/tests/expressions/valuelabel.sh b/tests/expressions/valuelabel.sh
index ef21e041f5..1c29a7a523 100755
--- a/tests/expressions/valuelabel.sh
+++ b/tests/expressions/valuelabel.sh
@@ -19,6 +19,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/expressions/variables.sh b/tests/expressions/variables.sh
index 8ffe3c8d87..c4a2d5d46e 100755
--- a/tests/expressions/variables.sh
+++ b/tests/expressions/variables.sh
@@ -19,6 +19,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/expressions/vectors.sh b/tests/expressions/vectors.sh
index 82989720bc..57cef8b660 100755
--- a/tests/expressions/vectors.sh
+++ b/tests/expressions/vectors.sh
@@ -20,6 +20,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/formats/360.sh b/tests/formats/360.sh
index c813e64876..5139dd30ab 100755
--- a/tests/formats/360.sh
+++ b/tests/formats/360.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/formats/bcd-in.sh b/tests/formats/bcd-in.sh
index f93adeafee..934f4302c0 100755
--- a/tests/formats/bcd-in.sh
+++ b/tests/formats/bcd-in.sh
@@ -18,6 +18,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/formats/float-format.sh b/tests/formats/float-format.sh
index b146d18993..2a6b608740 100755
--- a/tests/formats/float-format.sh
+++ b/tests/formats/float-format.sh
@@ -19,6 +19,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/formats/format-guesser.sh b/tests/formats/format-guesser.sh
index ce98b1266b..75885a7830 100755
--- a/tests/formats/format-guesser.sh
+++ b/tests/formats/format-guesser.sh
@@ -19,9 +19,12 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
-     :
 }
 
 
diff --git a/tests/formats/ib-in.sh b/tests/formats/ib-in.sh
index 0519d27d49..3a54c2f0fc 100755
--- a/tests/formats/ib-in.sh
+++ b/tests/formats/ib-in.sh
@@ -18,6 +18,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/formats/legacy-in.sh b/tests/formats/legacy-in.sh
index cfb5f47ef0..1087a06f12 100755
--- a/tests/formats/legacy-in.sh
+++ b/tests/formats/legacy-in.sh
@@ -18,6 +18,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/output/paper-size.sh b/tests/output/paper-size.sh
index 5473937605..dfe395b4fb 100755
--- a/tests/output/paper-size.sh
+++ b/tests/output/paper-size.sh
@@ -21,6 +21,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/stats/descript-basic.sh b/tests/stats/descript-basic.sh
index 765172b287..82b8cdaa24 100755
--- a/tests/stats/descript-basic.sh
+++ b/tests/stats/descript-basic.sh
@@ -21,6 +21,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/stats/descript-mean-bug.sh b/tests/stats/descript-mean-bug.sh
index defe833f04..72d7841f33 100755
--- a/tests/stats/descript-mean-bug.sh
+++ b/tests/stats/descript-mean-bug.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/stats/descript-missing.sh b/tests/stats/descript-missing.sh
index 8759343015..a295be5dca 100755
--- a/tests/stats/descript-missing.sh
+++ b/tests/stats/descript-missing.sh
@@ -21,6 +21,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
diff --git a/tests/stats/moments.sh b/tests/stats/moments.sh
index 947b4cd1d7..89854285a0 100755
--- a/tests/stats/moments.sh
+++ b/tests/stats/moments.sh
@@ -19,9 +19,12 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
-     :
 }
 
 
diff --git a/tests/stats/ntiles.sh b/tests/stats/ntiles.sh
index f696cf95b5..dd00a36136 100755
--- a/tests/stats/ntiles.sh
+++ b/tests/stats/ntiles.sh
@@ -19,9 +19,12 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
-     :
 }
 
 
diff --git a/tests/stats/percentiles-compatible.sh b/tests/stats/percentiles-compatible.sh
index 63a19068d6..d1e724d70f 100755
--- a/tests/stats/percentiles-compatible.sh
+++ b/tests/stats/percentiles-compatible.sh
@@ -23,9 +23,12 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
-     :
 }
 
 
diff --git a/tests/stats/percentiles-enhanced.sh b/tests/stats/percentiles-enhanced.sh
index 6d6e2b0312..f818f820b4 100755
--- a/tests/stats/percentiles-enhanced.sh
+++ b/tests/stats/percentiles-enhanced.sh
@@ -23,9 +23,12 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
-     :
 }
 
 
diff --git a/tests/xforms/recode.sh b/tests/xforms/recode.sh
index 46586bdba0..b9cabe0a82 100755
--- a/tests/xforms/recode.sh
+++ b/tests/xforms/recode.sh
@@ -23,6 +23,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }