X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ffile-label.sh;h=be5a80473b08ce677141b95d3fe489c68c38b83b;hb=f4b04e8323d4c95c3723ca47587742e7175ae75f;hp=99a3f6fd2dd56866e2454f5492732035f135095c;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp

diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh
index 99a3f6fd2d..be5a80473b 100755
--- a/tests/command/file-label.sh
+++ b/tests/command/file-label.sh
@@ -16,6 +16,7 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -115,7 +116,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare results"
-diff -b -B $TEMPDIR/pspp.filtered - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.filtered
+diff -b  $TEMPDIR/pspp.filtered - <<EOF
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -123,41 +125,28 @@ diff -b -B $TEMPDIR/pspp.filtered - <<EOF
 |X       |     1|  1-  1|F1.0  |
 |Y       |     1|  2-  2|F1.0  |
 +--------+------+-------+------+
-
 Documents in the active file:
-
    First line of a document
    This is the second very long line of a document in an attempt to overflow the
    Note that the last line should end with a period: .
-
 File label:
 This is a test file label
-
 Documents in the active file:
-
    First line of a document
    This is the second very long line of a document in an attempt to overflow the
    Note that the last line should end with a period: .
-
 File label:
 This is a test file label
-
 Documents in the active file:
-
    First line of a document
    This is the second very long line of a document in an attempt to overflow the
    Note that the last line should end with a period: .
- 
    There should be another document now.
-
 Documents in the active file:
-
    First line of a document
    This is the second very long line of a document in an attempt to overflow the
    Note that the last line should end with a period: .
- 
    There should be another document now.
-
 File label:
 This is a test file label
 EOF