X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fimport-export.sh;h=e63eb2f8af91c3956dc488aed2c7cbe17aeefd82;hb=d01cc07b11b5919369bf4e8989360c2b4fe0380c;hp=0cb178bf5776ade7e26ac28b5218f2eefd18e70f;hpb=537fdeb3702c011e05d7826a8d556a7beeba2605;p=pspp diff --git a/tests/command/import-export.sh b/tests/command/import-export.sh index 0cb178bf57..e63eb2f8af 100755 --- a/tests/command/import-export.sh +++ b/tests/command/import-export.sh @@ -9,7 +9,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` @@ -74,17 +74,16 @@ 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 no_result ; fi activity="compare output" -perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list -diff -b $TEMPDIR/pspp.list - << EOF - X Y --------- -------- - 1.00 2.00 - 3.00 . - 5.00 6.00 +diff -c $TEMPDIR/pspp.csv - << EOF +Table: Data List +X,Y +1.00,2.00 +3.00,. +5.00,6.00 EOF if [ $? -ne 0 ] ; then fail ; fi