X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fprint.sh;h=a0b806e5e0f6453f55bad717a3a644b9acf5da50;hb=392c853531c97fd8192cea98ab7c8e067436bf8b;hp=c5de1e9fe6f40992fc9c8d0d23b4249c0d242464;hpb=9aff19b717bcc242e16d04c34f348fd79ebdd685;p=pspp diff --git a/tests/command/print.sh b/tests/command/print.sh index c5de1e9fe6..a0b806e5e0 100755 --- a/tests/command/print.sh +++ b/tests/command/print.sh @@ -37,6 +37,10 @@ export LANG cleanup() { + if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then + echo "NOT cleaning $TEMPDIR" + return ; + fi cd / rm -rf $TEMPDIR } @@ -101,7 +105,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $PSPP --testing-mode --error-file=$TEMPDIR/errs $TEMPDIR/print.stat +$SUPERVISOR $PSPP -o pspp.csv --error-file=$TEMPDIR/errs $TEMPDIR/print.stat if [ $? -ne 0 ] ; then fail ; fi activity="compare print.out" @@ -155,32 +159,56 @@ EOF if [ $? -ne 0 ] ; then fail ; fi activity="compare output" -diff $TEMPDIR/pspp.list - << EOF +diff $TEMPDIR/pspp.csv - << EOF 1 2 + + 12 + 1 -2 + + 3 4 + + 34 + 3 -4 + + . 6 + + .6 + . -6 + + 7 . + + 7. + 7 -. + + 9 0 + + 90 + 9 -0 + EOF if [ $? -ne 0 ] ; then fail ; fi