Add optional callback functions to categoricals.

[pspp] / tests / command / file-handle.sh

diff --git a/tests/command/file-handle.sh b/tests/command/file-handle.sh
index b41c5a5405d6c8eb04b8b11bb8c82a166494d0d0..f63b50a82a11fcf298415cf71a3ad9e1d4709c13 100755 (executable)
--- a/tests/command/file-handle.sh
+++ b/tests/command/file-handle.sh
@@ -9,7 +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
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -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
 }
@@ -72,26 +76,22 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
-diff  -b  $TEMPDIR/pspp.list - << EOF 
-1.1 DATA LIST.  Reading free-form data from myhandle.
-+--------+------+
-|Variable|Format|
-#========#======#
-|x       |F8.0  |
-+--------+------+
-
-       x
---------
-    1.00 
-    2.00 
-    5.00 
-  109.00 
-
+diff -c $TEMPDIR/pspp.csv - << EOF 
+Table: Reading free-form data from myhandle.
+Variable,Format
+x,F8.0
+
+Table: Data List
+x
+1.00
+2.00
+5.00
+109.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi