pspp: Get rid of clean_up() function now that it has only one caller.

[pspp-builds.git] / tests / bugs / temporary.sh

diff --git a/tests/bugs/temporary.sh b/tests/bugs/temporary.sh
index d2091669a95a4106779432943e1192363e0f3ee2..cb0042255b7615ccc91eef525a864f20ebfd8bb5 100755 (executable)
--- a/tests/bugs/temporary.sh
+++ b/tests/bugs/temporary.sh
@@ -10,7 +10,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
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -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
 }
@@ -76,29 +80,29 @@ list.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
-$SUPERVISOR $PSPP --testing-mode $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  -w $TEMPDIR/pspp.list - << EOF
-       X
---------
-    6.00 
-    7.00 
-    8.00 
-    9.00 
-       X
---------
-    1.00 
-    2.00 
-    3.00 
-    4.00 
-    5.00 
-    6.00 
-    7.00 
-    8.00 
-    9.00 
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+X
+6.00
+7.00
+8.00
+9.00
+
+Table: Data List
+X
+1.00
+2.00
+3.00
+4.00
+5.00
+6.00
+7.00
+8.00
+9.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi