expressions: Improve error message for bad quarter argument to DATE.QYR.

[pspp] / tests / expressions / epoch.sh

diff --git a/tests/expressions/epoch.sh b/tests/expressions/epoch.sh
index 27184e0812ff2cbf06277b3366f88c7165efaeab..7ba0df8ad2948026f669d29d22c0bfe76e7a0b56 100755 (executable)
--- a/tests/expressions/epoch.sh
+++ b/tests/expressions/epoch.sh
@@ -9,7 +9,7 @@ if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
 top_srcdir=`cd $top_srcdir; pwd`
 top_builddir=`cd $top_builddir; pwd`
-PSPP=$top_builddir/src/ui/terminal/pspp
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 
 STAT_CONFIG_PATH=$top_srcdir/config
@@ -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
 }
@@ -138,7 +142,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out
+$SUPERVISOR $PSPP --testing-mode -o pspp.csv $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out
 
 activity="compare results"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/epoch.out