Made all the tests respect the PSPP_TEST_NO_CLEANUP environment variable.

[pspp-builds.git] / tests / command / t-test-pairs.sh

diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh
index ec38c50e0cb8d968d5c4cc5234510a039b71ed4e..25946236121aa271a76e6bcbe62b9b1a60a313ac 100755 (executable)
--- a/tests/command/t-test-pairs.sh
+++ b/tests/command/t-test-pairs.sh
@@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps
 if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
 if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -19,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
 }
@@ -68,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
@@ -99,7 +104,7 @@ diff  -b $TEMPDIR/pspp.list - <<EOF
 #===========#=====================================================#======#==#===============#
 #           #                  Paired Differences                 |      |  |               #
 #           #-------+--------------+---------------+--------------+      |  |               #
-#           #       |              |               |     95%      |      |  |               #
+#           #       |              |               |95% Confidence|      |  |               #
 #           #       |              |               +-------+------+      |  |               #
 #           #  Mean |Std. Deviation|Std. Error Mean| Lower | Upper|   t  |df|Sig. (2-tailed)#
 #===========#=======#==============#===============#=======#======#======#==#===============#