X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fbugs%2Fget.sh;h=740b7b5cde162e1e9b250414fe7236647521c679;hb=9804b8c5512567ed20901fd1d66e209ccdde342c;hp=824d93c3617a1988f110309a13b729dbd1d7cb17;hpb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;p=pspp-builds.git diff --git a/tests/bugs/get.sh b/tests/bugs/get.sh index 824d93c3..740b7b5c 100755 --- a/tests/bugs/get.sh +++ b/tests/bugs/get.sh @@ -12,11 +12,13 @@ here=`pwd`; # ensure that top_srcdir is absolute cd $top_srcdir; top_srcdir=`pwd` -export STAT_CONFIG_PATH=$top_srcdir/config +STAT_CONFIG_PATH=$top_srcdir/config +export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } @@ -84,7 +86,8 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" -diff -b -B -w $TEMPDIR/pspp.list - << EOF +perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list +diff -b -w $TEMPDIR/pspp.list - << EOF LOCATION EDITOR SHELL FREQ -------- -------- -------- -------- 1.00 1.00 1.00 2.00 @@ -95,8 +98,6 @@ LOCATION EDITOR SHELL FREQ 2.00 1.00 2.00 22.00 2.00 2.00 1.00 1.00 2.00 2.00 2.00 3.00 - - LOCATION EDITOR SHELL FREQ -------- -------- -------- -------- 1.00 1.00 1.00 2.00 @@ -107,7 +108,6 @@ LOCATION EDITOR SHELL FREQ 2.00 1.00 2.00 22.00 2.00 2.00 1.00 1.00 2.00 2.00 2.00 3.00 - EOF if [ $? -ne 0 ] ; then fail ; fi