X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fline-ends.sh;h=2c12e4f67e851afa75539c8d9608fd527b193a48;hb=b350a68a008217d92eb4cbcd571e322118d4e27a;hp=ca03b5cad88ae341abd2eb833ad8bdc5ce4b2eea;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp-builds.git

diff --git a/tests/command/line-ends.sh b/tests/command/line-ends.sh
index ca03b5ca..2c12e4f6 100755
--- a/tests/command/line-ends.sh
+++ b/tests/command/line-ends.sh
@@ -10,7 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps
 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`
@@ -83,21 +83,20 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare output"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF
-       a        b        c
--------- -------- --------
-    1.00     2.00     3.00
-    4.00     5.00     6.00
-    7.00     8.00     9.00
-   10.00    11.00    12.00
-   13.00    14.00    15.00
-   16.00    17.00    18.00
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+a,b,c
+1.00,2.00,3.00
+4.00,5.00,6.00
+7.00,8.00,9.00
+10.00,11.00,12.00
+13.00,14.00,15.00
+16.00,17.00,18.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi