VALUE LABELS: Convert tests to Autotest framework.

[pspp-builds.git] / tests / bugs / keep-all.sh

diff --git a/tests/bugs/keep-all.sh b/tests/bugs/keep-all.sh
index bd3deca86b0db11e0c998bd9f1100c470a3765b0..bbfd707baf7e43d48015d836e0fb442f6d6e50bf 100755 (executable)
--- a/tests/bugs/keep-all.sh
+++ b/tests/bugs/keep-all.sh
@@ -10,7 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.pspp
 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
 }
@@ -69,19 +73,19 @@ EOF
     if [ $? -ne 0 ] ; then no_result ; fi
 
     activity="run PSPP ($mode)"
-    $SUPERVISOR $PSPP -o raw-ascii $TESTFILE
+    $SUPERVISOR $PSPP -o pspp.csv $TESTFILE
     if [ $? -ne 0 ] ; then no_result ; fi
 
 
     activity="compare output ($mode)"
-    perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-    diff -u -b  -w $TEMPDIR/pspp.list - << EOF
- a  b  c  d  e  f  g  h  i  j  k  l  m  n  o  p  q  r  s  t  u  v  w  x  y  z
--- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
- 1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 
- x  y  z  a  b  c  d  e  f  g  h  i  j  k  l  m  n  o  p  q  r  s  t  u  v  w
--- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-24 25 26  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 
+    diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z
+1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26
+
+Table: Data List
+x,y,z,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w
+24,25,26,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
 EOF
     if [ $? -ne 0 ] ; then fail ; fi
 done