X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fsysfile-info.sh;h=3456fba2e33f0791a7d2960eb6eb7d0b427947b1;hb=fd349404fdd08760cec579198c830bf5b8aede0f;hp=17969c5ee4e8aee4e0a47093c0c7182faac0b058;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp-builds.git

diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh
index 17969c5e..3456fba2 100755
--- a/tests/command/sysfile-info.sh
+++ b/tests/command/sysfile-info.sh
@@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps
 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
 top_srcdir=`cd $top_srcdir; pwd`
@@ -16,6 +17,8 @@ top_srcdir=`cd $top_srcdir; pwd`
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
 
+LANG=C
+export LANG
 
 cleanup()
 {
@@ -71,11 +74,11 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $top_builddir/src/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"
@@ -89,21 +92,27 @@ diff -b -w $TEMPDIR/out-filtered - << EOF
 |name    |A10   |
 +--------+------+
 2.1 SYSFILE INFO.  
-File:      pro.sav
-Label:     No label.
-Variables: 2
-Cases:     3
-Type:      System File.
-Weight:    Not weighted.
-Mode:      Compression off.
+File:           pro.sav
+Label:          No label.
+Variables:      2
+Cases:          3
+Type:           System File.
+Weight:         Not weighted.
+Mode:           Compression on.
 +--------+-------------+---+
 |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