Merge commit 'origin/stable'

[pspp-builds.git] / tests / command / sysfile-info.sh

diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh
index 38c61e15b30898e6a7c715a139525291ec784615..bc11fa3a20ad6120b45901fd57d79995c7255158 100755 (executable)
--- a/tests/command/sysfile-info.sh
+++ b/tests/command/sysfile-info.sh
@@ -74,11 +74,11 @@ 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
 
 activity="filter output"
-egrep -v '^(Created|Endian): ' $TEMPDIR/pspp.list > $TEMPDIR/out-filtered
+egrep -v '^(Created|Endian|Integer Format|Real Format): ' $TEMPDIR/pspp.list > $TEMPDIR/out-filtered
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
@@ -94,21 +94,26 @@ diff -b -w $TEMPDIR/out-filtered - << EOF
 2.1 SYSFILE INFO.  
 File:           pro.sav
 Label:          No label.
-Integer Format: Little Endian.
-Real Format:    IEEE 754 LE.
 Variables:      2
 Cases:          3
 Type:           System File.
 Weight:         Not weighted.
 Mode:           Compression on.
+Charset:        Unknown
 +--------+-------------+---+
 |Variable|Description  |Pos|
 |        |             |iti|
 |        |             |on |
 #========#=============#===#
 |x       |Format: F8.2 |  1|
+|        |Measure:     |   |
+|        |Display      |   |
+|        |Display      |   |
 +--------+-------------+---+
 |name    |Format: A10  |  2|
+|        |Measure:     |   |
+|        |Display      |   |
+|        |Display      |   |
 +--------+-------------+---+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi