X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ffile-label.sh;h=4b6ab0e62200ea9af07b5cced5e2e7627ac1f8ec;hb=436b01ace5b84c27963f6130dca0e69fe15f9a17;hp=eb77926602c2e971f2f71e54d796f3f40d962860;hpb=af444ed55b08448b9a44cf54cd20af324b0ab4c4;p=pspp-builds.git

diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh
index eb779266..4b6ab0e6 100755
--- a/tests/command/file-label.sh
+++ b/tests/command/file-label.sh
@@ -1,19 +1,28 @@
 #!/bin/sh
 
-# This program tests the FILE LABEL and  DOCUMENT commands
+# This program tests the FILE LABEL and  DOCUMENT, and ADD DOCUMENT commands
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 # ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
+LANG=C
+export LANG
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -46,11 +55,10 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/file-lab.stat << EOF
-
+cat > $TESTFILE << EOF
 
 /* Set up a dummy active file in memory.
-data list /x 1 y 2.
+data list /X 1 Y 2.
 begin data.
 16
 27
@@ -66,18 +74,21 @@ 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.
 display documents.
-display file label.	/* undocumented feature of PSPP
+display file label.
+
+ADD DOCUMENT 'Line one' 'Line two'.
 
 /* Save the active file then get it and display the documents again.
-save 'foo.save'.
-get 'foo.save'.
+save /OUTFILE='foo.save'.
+get /FILE='foo.save'.
 display documents.
-display file label.	/* undocumented feature of PSPP
+display file label.
 
 /* There is an interesting interaction that occurs if the 'execute'
 /* command below.  What happens is that an error message is output
@@ -93,10 +104,10 @@ document There should be another document now.
 display documents.
 
 /* Save and get.
-save 'foo.save'.
-get 'foo.save'.
+save /OUTFILE='foo.save'.
+get /FILE='foo.save'.
 display documents.
-display file label.	/* undocumented feature of PSPP
+display file label.
 
 /* Done.
 
@@ -104,58 +115,53 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/file-lab.stat
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 # We need to filter out the dates/times
 activity="date filter"
-grep -v 'Document entered' $TEMPDIR/pspp.list > $TEMPDIR/pspp.filtered
+grep -v '[Ee]ntered' $TEMPDIR/pspp.list > $TEMPDIR/pspp.filtered
 if [ $? -ne 0 ] ; then no_result ; fi
 
+
 activity="compare results"
-diff -b -B $TEMPDIR/pspp.filtered - <<EOF
-1.1 DATA LIST.  Reading 1 record from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.filtered
+diff -b  $TEMPDIR/pspp.filtered - <<EOF
+1.1 DATA LIST.  Reading 1 record from INLINE.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
 |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 
-   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 
-   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 
-   Note that the last line should end with a period: .
- 
-   There should be another document now.
-
+document First line of a document
+Second line of a document
+The last line should end with a period: .
+Line one
+Line two
+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 
-   Note that the last line should end with a period: .
- 
-   There should be another document now.
-
+document First line of a document
+Second line of a document
+The last line should end with a period: .
+Line one
+Line two
+document There should be another document now.
 File label:
 This is a test file label
 EOF