X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ffile-label.sh;h=e6211b4d4b8090189628ddd8c11e6fcc4de98122;hb=375a1fd3adcb23eb83ed6a6317ce0526f43964b3;hp=70a071502c139341855eb07c3933728324700673;hpb=fad7434e2db08ed248228e03533b314b8335ef2f;p=pspp-builds.git

diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh
index 70a07150..e6211b4d 100755
--- a/tests/command/file-label.sh
+++ b/tests/command/file-label.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -74,8 +78,8 @@ add value labels x 1 'first label mark two'.
 /* Add a file label and a few documents.
 file label This is a test file label.
 document First line of a document
-This is the second very long line of a document in an attempt to overflow the input buffer with a really long line
-Note that the last line should end with a period: .
+Second line of a document
+The last line should end with a period: .
 
 
 /* Display the documents.
@@ -115,7 +119,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 # We need to filter out the dates/times
@@ -135,33 +139,33 @@ diff -b  $TEMPDIR/pspp.filtered - <<EOF
 |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: .
+document First line of a document
+Second line of a document
+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: .
+document First line of a document
+Second line of a document
+The last line should end with a period: .
 Line one
 Line two
 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: .
+document First line of a document
+Second line of a document
+The last line should end with a period: .
 Line one
 Line two
-   There should be another document now.
+document 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: .
+document First line of a document
+Second line of a document
+The last line should end with a period: .
 Line one
 Line two
-   There should be another document now.
+document There should be another document now.
 File label:
 This is a test file label
 EOF