X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fsysfile-info.sh;h=d8f8ae3647ffe306e531c945184190eb9d0478a8;hb=9ff56712d2c03adaf0fb23a501c3ba0e00471b20;hp=a5990e913fdede651b15e94c91300f0eb814fd31;hpb=954a68ef1d8eea4ae89725073905d986177bdc3e;p=pspp-builds.git

diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh
index a5990e91..d8f8ae36 100755
--- a/tests/command/sysfile-info.sh
+++ b/tests/command/sysfile-info.sh
@@ -5,13 +5,20 @@
 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()
 {
@@ -19,6 +26,7 @@ cleanup()
 	echo "NOT cleaning $TEMPDIR"
      	return ; 
      fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -66,42 +74,47 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../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"
-diff $TEMPDIR/out-filtered - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/out-filtered
+diff -b -w $TEMPDIR/out-filtered - << EOF
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
 #========#======#
 |x       |F8.0  |
 |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.
+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