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
export STAT_CONFIG_PATH
activity="run program 1"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST. Reading free-form data from INLINE.
-+--------+------+
-|Variable|Format|
-#========#======#
-|x |F8.0 |
-|y |F8.0 |
-+--------+------+
-2.1 EXAMINE. Case Processing Summary
-#=#===============================#
-# # Cases #
-# #----------+----------+---------#
-# # Valid | Missing | Total #
-# #-+--------+-+--------+-+-------#
-# #N| Percent|N| Percent|N|Percent#
-#=#=#========#=#========#=#=======#
-#x#6|85.7143%|1|14.2857%|7| 100%#
-#=#=#========#=#========#=#=======#
-2.2 EXAMINE. Case Processing Summary
-#==========#===============================#
-# # Cases #
-# #----------+----------+---------#
-# # Valid | Missing | Total #
-# #-+--------+-+--------+-+-------#
-# y #N| Percent|N| Percent|N|Percent#
-#==========#=#========#=#========#=#=======#
-#x 1.00#4| 100%|0| 0%|4| 100%#
-# 2.00#2|66.6667%|1|33.3333%|3| 100%#
-#==========#=#========#=#========#=#=======#
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+x,F8.0
+y,F8.0
+
+Table: Case Processing Summary
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+x,6,85.7143%,1,14.2857%,7,100%
+
+Table: Case Processing Summary
+,,Cases,,,,,
+,,Valid,,Missing,,Total,
+,y,N,Percent,N,Percent,N,Percent
+x,1.00,4,100%,0,0%,4,100%
+,2.00,2,66.6667%,1,33.3333%,3,100%
EOF
if [ $? -ne 0 ] ; then fail ; fi
activity="run program 2"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
if [ $? -ne 0 ] ; then fail ; fi