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 7f7afb312d7df13ea17bb147e73852204580e578..cb0042255b7615ccc91eef525a864f20ebfd8bb5 100755 (executable)
--- a/tests/bugs/temporary.sh
+++ b/tests/bugs/temporary.sh
@@ -6,10 +6,14 @@
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+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$EXEEXT
 
 # ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -17,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
 }
@@ -72,29 +80,29 @@ list.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-diff -b -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