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`
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
}
activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/tabs.stat
+$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/tabs.stat
if [ $? -ne 0 ] ; then no_result ; fi
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
-1.1 DATA LIST. Reading 1 record from INLINE.
-+--------+------+-------+------+
-|Variable|Record|Columns|Format|
-#========#======#=======#======#
-|X | 1| 1- 80|A80 |
-+--------+------+-------+------+
+diff -c $TEMPDIR/pspp.csv - << EOF | perl -e 's/^\s*$//g'
+Table: Reading 1 record from INLINE.
+Variable,Record,Columns,Format
+X,1,1- 80,A80
+
1 12 123 1234 12345
EOF
if [ $? -ne 0 ] ; then fail ; fi