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
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
}
EOF
if [ $? -ne 0 ] ; then no_result ; fi
- # Make sure that pspp.list isn't left over from another run.
- rm -f pspp.list
+ # Make sure that pspp.csv isn't left over from another run.
+ rm -f pspp.csv
activity="run $type.pspp"
- $SUPERVISOR $PSPP --testing-mode $type.pspp
+ $SUPERVISOR $PSPP -o pspp.csv $type.pspp
if [ $? -ne 0 ] ; then fail ; fi
activity="compare $type.pspp output"
- perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
- diff -b $TEMPDIR/pspp.list - << EOF
- start end count
----------- ---------- -----
-07/22/2007 10/06/2007 321
-07/14/1789 08/26/1789 4
-01/01/1972 12/31/1999 682
- start end count
----------- ---------- -----
-07/22/2007 10/06/2007 322
-07/14/1789 08/26/1789 5
-01/01/1972 12/31/1999 683
+ diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+start,end,count
+07/22/2007,10/06/2007,321
+07/14/1789,08/26/1789,4
+01/01/1972,12/31/1999,682
+
+Table: Data List
+start,end,count
+07/22/2007,10/06/2007,322
+07/14/1789,08/26/1789,5
+01/01/1972,12/31/1999,683
EOF
if [ $? -ne 0 ] ; then fail ; fi
done