X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fmatch-files.sh;h=7864921f72d1208075422900440631495e7deef3;hb=c0ce908d11fa172e1d461f83156c27345c259a75;hp=e3827383c2eef3dc364beb4b35daa3b4963bd1b8;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp-builds.git

diff --git a/tests/command/match-files.sh b/tests/command/match-files.sh
index e3827383..7864921f 100755
--- a/tests/command/match-files.sh
+++ b/tests/command/match-files.sh
@@ -17,6 +17,7 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+    cd /
     rm -rf $TEMPDIR
     :
 }
@@ -164,7 +165,9 @@ EOF
 	if [ $? -ne 0 ] ; then no_result ; fi
 
 	activity="check $name output"
-	diff -b -w -B pspp.list $types.out
+	perl -pi -e 's/^\s*$//g' pspp.list
+	perl -pi -e 's/^\s*$//g' $types.out
+	diff -b -w pspp.list $types.out
 	if [ $? -ne 0 ] ; then fail ; fi
     done
 done
@@ -187,7 +190,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="check $name output"
-diff -b -w -B - pspp.list <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w - pspp.list <<EOF |perl -e 's/^\s*$//g'
 A B C D E F
 - - - - - -
 0 a A 1 b N
@@ -235,7 +239,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="check $name output"
-diff -b -w -B - pspp.list <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w - pspp.list <<EOF | perl -e 's/^\s*$//g'
         x        z        y
  -------- -------- --------
      3.00     8.00    30.00