SAVE: Convert test for non-empty case map to Autotest framework.

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

diff --git a/tests/bugs/get.sh b/tests/bugs/get.sh
index 550ef1a7faf0d9500e96b674a72387e83a69afaa..3fd6d5624de03ba355f5a2fe96c9c9cf25eacf83 100755 (executable)
--- a/tests/bugs/get.sh
+++ b/tests/bugs/get.sh
@@ -11,6 +11,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$EXEEXT
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -21,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
 }
@@ -82,35 +87,35 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 
 
 activity="compare output"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  -w $TEMPDIR/pspp.list - << EOF
-LOCATION   EDITOR    SHELL     FREQ
- -------- -------- -------- --------
-     1.00     1.00     1.00     2.00 
-     1.00     1.00     2.00    30.00 
-     1.00     2.00     1.00     8.00 
-     1.00     2.00     2.00    20.00 
-     2.00     1.00     1.00     2.00 
-     2.00     1.00     2.00    22.00 
-     2.00     2.00     1.00     1.00 
-     2.00     2.00     2.00     3.00 
-LOCATION   EDITOR    SHELL     FREQ
- -------- -------- -------- --------
-     1.00     1.00     1.00     2.00 
-     1.00     1.00     2.00    30.00 
-     1.00     2.00     1.00     8.00 
-     1.00     2.00     2.00    20.00 
-     2.00     1.00     1.00     2.00 
-     2.00     1.00     2.00    22.00 
-     2.00     2.00     1.00     1.00 
-     2.00     2.00     2.00     3.00 
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+LOCATION,EDITOR,SHELL,FREQ
+1.00,1.00,1.00,2.00
+1.00,1.00,2.00,30.00
+1.00,2.00,1.00,8.00
+1.00,2.00,2.00,20.00
+2.00,1.00,1.00,2.00
+2.00,1.00,2.00,22.00
+2.00,2.00,1.00,1.00
+2.00,2.00,2.00,3.00
+
+Table: Data List
+LOCATION,EDITOR,SHELL,FREQ
+1.00,1.00,1.00,2.00
+1.00,1.00,2.00,30.00
+1.00,2.00,1.00,8.00
+1.00,2.00,2.00,20.00
+2.00,1.00,1.00,2.00
+2.00,1.00,2.00,22.00
+2.00,2.00,1.00,1.00
+2.00,2.00,2.00,3.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi