X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fformats%2F360.sh;h=9c156efdfd465526331bf565375a9591f430a0af;hb=dfd1972f7bcb550a4fc3b05dbe7e71d12334b0a7;hp=5139dd30abcd6ba7565033593913a775119280da;hpb=c9a3c45e44c1c03d13d4eb186e3817bc836f75f8;p=pspp-builds.git diff --git a/tests/formats/360.sh b/tests/formats/360.sh index 5139dd30..9c156efd 100755 --- a/tests/formats/360.sh +++ b/tests/formats/360.sh @@ -231,26 +231,26 @@ list. EOF if [ $? -ne 0 ] ; then no_result ; fi - # Make sure that pspp.list isn't left over from another run. - rm -f pspp.list + # Make sure that pspp.csv isn't left over from another run. + rm -f pspp.csv activity="run $type.pspp" $SUPERVISOR $PSPP --testing-mode $type.pspp if [ $? -ne 0 ] ; then fail ; fi activity="compare $type.pspp output" - perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list - diff -b $TEMPDIR/pspp.list - << EOF - start end count ----------- ---------- ----- -07/22/2007 10/06/2007 321 -07/14/1789 08/26/1789 4 -01/01/1972 12/31/1999 682 - start end count ----------- ---------- ----- -07/22/2007 10/06/2007 322 -07/14/1789 08/26/1789 5 -01/01/1972 12/31/1999 683 + diff -c $TEMPDIR/pspp.csv - << EOF +Table: Data List +start,end,count +07/22/2007,10/06/2007,321 +07/14/1789,08/26/1789,4 +01/01/1972,12/31/1999,682 + +Table: Data List +start,end,count +07/22/2007,10/06/2007,322 +07/14/1789,08/26/1789,5 +01/01/1972,12/31/1999,683 EOF if [ $? -ne 0 ] ; then fail ; fi done