Oneway: Remove dict member from struct and add wv member

[pspp] / tests / command / do-if.sh

diff --git a/tests/command/do-if.sh b/tests/command/do-if.sh
index 185dc4e4fc4488cb9ad86974f776f39a5e48de21..f55bcdae2911278f8e3b5a34ba2cb1b171fd821c 100755 (executable)
--- a/tests/command/do-if.sh
+++ b/tests/command/do-if.sh
@@ -8,7 +8,7 @@ TEMPDIR=/tmp/pspp-tst-$$
 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,8 +21,12 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
-     #rm -rf $TEMPDIR
+     rm -rf $TEMPDIR
 }
 
 
@@ -104,11 +108,10 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run test1"
-$SUPERVISOR $PSPP --testing-mode test1.pspp
+$SUPERVISOR $PSPP -o pspp.csv test1.pspp
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare test1 results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff -u $TEMPDIR/test1.out $TEMPDIR/test1.expected
 if [ $? -ne 0 ] ; then fail ; fi