X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Foverwrite-input-file.sh;h=d9f3e59cb5ce81d0ad33c56ba807be4e3117b5b5;hb=5282b76bcbd0501c1227b36e4d451f340388eca5;hp=185de8b482b5c92493869e198740a9dd3708a88e;hpb=707848060e414fe93458834446dd7cdbf800667f;p=pspp-builds.git

diff --git a/tests/bugs/overwrite-input-file.sh b/tests/bugs/overwrite-input-file.sh
index 185de8b4..d9f3e59c 100755
--- a/tests/bugs/overwrite-input-file.sh
+++ b/tests/bugs/overwrite-input-file.sh
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -162,7 +166,8 @@ $SUPERVISOR $PSPP --testing-mode $TESTFILE -e /dev/null
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -b -B pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b pspp.list - << EOF
        X        Y
 -------- --------
     1.00     2.00
@@ -170,7 +175,6 @@ diff -b -B pspp.list - << EOF
     3.00     4.00
     4.00     5.00
     5.00     6.00
-
 X        Y
 - --------
 1     3.00
@@ -178,7 +182,6 @@ X        Y
 3     5.00
 4     6.00
 5     7.00
-
 X        Y
 - --------
 1     4.00