cast: New macro NULL_SENTINEL.

[pspp] / tests / output / paper-size.sh

diff --git a/tests/output/paper-size.sh b/tests/output/paper-size.sh
index 547393760551b598b6fc8becbe0ef2df10a3cee4..e308abc47b5d0e6b1c18f95c2dc1c1b4de83987d 100755 (executable)
--- a/tests/output/paper-size.sh
+++ b/tests/output/paper-size.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,6 +21,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -64,7 +68,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="Run pspp 1"
-PAPERSIZE=letter $SUPERVISOR $PSPP --testing-mode paper-size.pspp > paper-size.out
+PAPERSIZE=letter $SUPERVISOR $PSPP --testing-mode -o pspp.csv paper-size.pspp > paper-size.out
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
@@ -84,7 +88,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="Run pspp 2"
-PAPERSIZE=a4 $SUPERVISOR $PSPP --testing-mode paper-size-2.pspp > paper-size-2.out
+PAPERSIZE=a4 $SUPERVISOR $PSPP --testing-mode -o pspp.csv paper-size-2.pspp > paper-size-2.out
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results 2"