X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fmatch-files-scratch.sh;h=5d8df99320de08e3e661502878ccdf5971f8cf61;hb=5643b25173203af07925fdc4d12bda1f62769502;hp=dd95c2c0772f9a404fb2e30a7dfd2d4bac5d8602;hpb=af4066391f20365e210460a736b1b02efe194da6;p=pspp diff --git a/tests/bugs/match-files-scratch.sh b/tests/bugs/match-files-scratch.sh index dd95c2c077..5d8df99320 100755 --- a/tests/bugs/match-files-scratch.sh +++ b/tests/bugs/match-files-scratch.sh @@ -11,7 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.pspp 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` @@ -78,24 +78,21 @@ FINISH. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $PSPP --testing-mode $TESTFILE +$SUPERVISOR $PSPP -o pspp.csv $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi -perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list -diff -b -w $TEMPDIR/pspp.list - << EOF -1.1 DATA LIST. Reading free-form data from INLINE. -+--------+------+ -|Variable|Format| -#========#======# -|w |F8.0 | -|x |F8.0 | -|y |F8.0 | -+--------+------+ - x y j --------- -------- -------- - 5.00 6.00 55.00 - 2.00 3.00 55.00 +diff -c $TEMPDIR/pspp.csv - << EOF +Table: Reading free-form data from INLINE. +Variable,Format +w,F8.0 +x,F8.0 +y,F8.0 + +Table: Data List +x,y,j +5.00,6.00,55.00 +2.00,3.00,55.00 EOF if [ $? -ne 0 ] ; then fail ; fi