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`
activity="run program"
-$SUPERVISOR $PSPP --testing-mode $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-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|
-#==============#======#
-|AlphaBetaGamma|F8.0 |
-|B |F8.0 |
-|X |F8.0 |
-|Yabbadabbadoo |F8.0 |
-+--------------+------+
-AlphaBetaGamma B X Yabbadabbadoo
--------------- -------- -------- -------------
- 2.00 3.00 4.00 5.00
-2.1 CROSSTABS. Summary.
-#===============#=====================================================#
-# # Cases #
-# #-----------------+-----------------+-----------------#
-# # Valid | Missing | Total #
-# #--------+--------+--------+--------+--------+--------#
-# # N| Percent| N| Percent| N| Percent#
-#---------------#--------+--------+--------+--------+--------+--------#
-#X * # 1| 100.0%| 0| 0.0%| 1| 100.0%#
-#Yabbadabbadoo # | | | | | #
-#===============#========#========#========#========#========#========#
-2.2 CROSSTABS. X * Yabbadabbadoo [count].
-#===============#==============================================================#========#
-# # Yabbadabbadoo | #
-# #--------+--------+--------+--------+--------+--------+--------+ #
-# X# 1.00| 2.00| 3.00| 4.00| 5.00| 6.00| 7.00| Total #
-#---------------#--------+--------+--------+--------+--------+--------+--------+--------#
-# 1.00# .0| .0| .0| .0| .0| .0| .0| .0#
-# 2.00# .0| .0| .0| .0| .0| .0| .0| .0#
-# 3.00# .0| .0| .0| .0| .0| .0| .0| .0#
-# 4.00# .0| .0| .0| .0| 1.0| .0| .0| 1.0#
-# 5.00# .0| .0| .0| .0| .0| .0| .0| .0#
-# 6.00# .0| .0| .0| .0| .0| .0| .0| .0#
-# 7.00# .0| .0| .0| .0| .0| .0| .0| .0#
-#Total # .0| .0| .0| .0| 1.0| .0| .0| 1.0#
-#===============#========#========#========#========#========#========#========#========#
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+AlphaBetaGamma,F8.0
+B,F8.0
+X,F8.0
+Yabbadabbadoo,F8.0
+
+Table: Data List
+AlphaBetaGamma,B,X,Yabbadabbadoo
+2.00,3.00,4.00,5.00
+
+Table: Summary.
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+X * Yabbadabbadoo,1,100.0%,0,0.0%,1,100.0%
+
+Table: X * Yabbadabbadoo [count].
+,Yabbadabbadoo,,,,,,,
+X,1.00,2.00,3.00,4.00,5.00,6.00,7.00,Total
+1.00,.0,.0,.0,.0,.0,.0,.0,.0
+2.00,.0,.0,.0,.0,.0,.0,.0,.0
+3.00,.0,.0,.0,.0,.0,.0,.0,.0
+4.00,.0,.0,.0,.0,1.0,.0,.0,1.0
+5.00,.0,.0,.0,.0,.0,.0,.0,.0
+6.00,.0,.0,.0,.0,.0,.0,.0,.0
+7.00,.0,.0,.0,.0,.0,.0,.0,.0
+Total,.0,.0,.0,.0,1.0,.0,.0,1.0
EOF
if [ $? -ne 0 ] ; then fail ; fi