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: v0.6.0~6
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af4066391f20365e210460a736b1b02efe194da6;p=pspp-builds.git

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 cdb94cdc..0b006780 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 cc0bad23..43fd9f8c 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 49d9fe25..ae60e79c 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 ecc09468..b0da13bb 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 8cec3c61..3c9365df 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 ab9971f0..011c344d 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 6122e660..342f9bc0 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 1d898dba..0d4a313e 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 8b7f7fd1..b0baf4f0 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 846ef79e..83aeae04 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 08077e57..dfa5990a 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 0531094a..99ec07ca 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 043aff87..5866d0e5 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 818682d7..3ef691f3 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 9c46e9ff..26de22b2 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 1cf5d794..dfdcbfdc 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 1c9405e8..ca958cd1 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 9829230d..b96b2fea 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 8fe628f5..49ce086c 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 a2e79cec..5e3edec3 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 5e4de67a..d047b767 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 1ab18044..2cc6cfc5 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 8fda1439..789fe32c 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 bda4a73c..4f07d302 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 1450889f..f64674de 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 87a411ad..73bce147 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 4830ddd3..dd95c2c0 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 24b3a5ed..620d42f8 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 8c1fecdd..d9f3e59c 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 c23a8d4a..2bac4413 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 c41dbf00..e423f3e8 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 9ba32baa..912590a3 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 66388913..ae7ebf13 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 b1450d18..c49103a8 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 7882d8a5..92dc3fb0 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 6386ac2c..e8c43ebc 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 64f12ee9..8e0e2c7a 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 d2091669..8ffa8611 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 705c45b9..774b6230 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 a014aa7f..7388caaa 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 c287bde8..4d57f661 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 8fca96fa..0992e45b 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 47e00239..e956fcfa 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 9071a475..6d835015 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 e5081918..41e1963c 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 7c70fa21..0813c428 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 fbad9c80..7d3890c3 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 475e0085..2ad30d73 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 185dc4e4..8cb6b824 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 3f37618a..0f395422 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 0599bed3..491f79aa 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 feb052c4..fc648313 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 8638d1ad..708e5342 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 4f710f5b..d63c2587 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 b41c5a54..3dfe52f1 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 4b6ab0e6..e6211b4d 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 40729c85..ec76fba9 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 dc2b1770..a3e5caf2 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 d9fab750..c601b506 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 40cdc621..1c7b7cef 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 68ee637d..2bd0346b 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 67fc8d2a..f0c2b5c4 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 0d7d95ca..a6e8c778 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 68f4f9c7..bc14e1a9 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 ab95a0b3..504314a9 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 184be565..2a75f64b 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 d8f930c8..813777f4 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 bb4107e5..965539c8 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 4b1e0eb4..6641b520 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 ec3634ca..2b16368b 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 359efa10..db54cd5a 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 c5de1e9f..4a052758 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 2837223e..ff46486a 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 6ba6646b..4f4515e2 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 c3c96a35..d66681be 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 60b4d3a5..eb2c991c 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 4b2c8cd4..df16690b 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 2bfd6a5b..d4f59052 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 24904901..5f4a5c17 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 51ec1dc1..4cc2effa 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 8d63a3e2..07471484 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 bf421bd4..4019865b 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 05cc1835..53080bdf 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 181c73b6..fd307ff3 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 2c7114f1..2e62b4d2 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 533dfa49..a747d4fd 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 4317a574..0f96be4e 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 f657e8fb..25946236 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 c6d968b1..ad530f45 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 7346e526..e2a5af71 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 f81b2264..18b66f0f 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 bb639d10..d3f68024 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 94c0c469..e99fab4b 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 01bd0a31..6d903156 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 27184e08..1ceab308 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 8f55efda..339abed4 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 188e8ac3..58fe386d 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 ef21e041..1c29a7a5 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 8ffe3c8d..c4a2d5d4 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 82989720..57cef8b6 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 c813e648..5139dd30 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 f93adeaf..934f4302 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 b146d189..2a6b6087 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 ce98b126..75885a78 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 0519d27d..3a54c2f0 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 cfb5f47e..1087a06f 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 54739376..dfe395b4 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 765172b2..82b8cdaa 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 defe833f..72d7841f 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 87593430..a295be5d 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 947b4cd1..89854285 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 f696cf95..dd00a361 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 63a19068..d1e724d7 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 6d6e2b03..f818f820 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 46586bdb..b9cabe0a 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
 }