X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fdata-list.sh;h=12f66377d26976fe6fd968bb760ea913ab90da78;hb=053e7ff6e0a45a25d5604b211e9c950fff50e75d;hp=bbcd589a546eeed1589b4c07ae00b8fa90494438;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp diff --git a/tests/command/data-list.sh b/tests/command/data-list.sh index bbcd589a54..12f66377d2 100755 --- a/tests/command/data-list.sh +++ b/tests/command/data-list.sh @@ -16,6 +16,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } @@ -105,8 +106,9 @@ $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii --testing-mode $TESTFI if [ $? -ne 0 ] ; then fail ; fi activity="compare output" -diff -b -B $TEMPDIR/pspp.list - << EOF -1.1 DATA LIST. Reading free-form data from the command file. +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| #========#======# @@ -115,13 +117,11 @@ diff -b -B $TEMPDIR/pspp.list - << EOF |C |F8.0 | |D |F8.0 | +--------+------+ - A B C D -------- -------- -------- -------- 1.00 23.00 45.00 2.03 2.00 22.00 34.00 23.00 3.00 34.00 34.00 34.00 - A B C D -------- -------- -------- -------- . 1.00 2.00 3.00 @@ -130,7 +130,6 @@ diff -b -B $TEMPDIR/pspp.list - << EOF .00 1.00 . . . . . . 2.00 3.00 4.00 5.00 - A B C D -------- -------- -------- -------- 1.00 2.00 3.00 4.00