Improved the syntax generated by the select-cases dialog

[pspp] / tests / formats / legacy-in.sh

diff --git a/tests/formats/legacy-in.sh b/tests/formats/legacy-in.sh
index cfb5f47ef04a6bffec9d126f68bd459a0d18c6af..bdf41c516b30eed83927905fa888615ac6c31444 100755 (executable)
--- a/tests/formats/legacy-in.sh
+++ b/tests/formats/legacy-in.sh
@@ -6,7 +6,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
 : ${PERL:=perl}
 
 # ensure that top_srcdir is absolute
@@ -18,6 +18,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -67,7 +71,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode legacy-in.pspp
+$SUPERVISOR $PSPP -o pspp.csv legacy-in.pspp
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="gunzip expected results"