X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fsysfile-info.sh;h=03d71f741f32fbb3bf409b80c251cf5ff1605131;hb=ee5220fe34ba25c47120fe5dc2e6e266cb439e92;hp=ffa00c35528fb823ca01ddf9ef18f2343234724b;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp-builds.git

diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh
index ffa00c35..03d71f74 100755
--- a/tests/command/sysfile-info.sh
+++ b/tests/command/sysfile-info.sh
@@ -5,10 +5,14 @@
 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`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -20,6 +24,7 @@ cleanup()
 	echo "NOT cleaning $TEMPDIR"
      	return ; 
      fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -67,7 +72,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="filter output"
@@ -75,15 +80,15 @@ egrep -v '^(Created|Endian): ' $TEMPDIR/pspp.list > $TEMPDIR/out-filtered
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -b -B -w $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.
@@ -91,8 +96,7 @@ Variables: 2
 Cases:     3
 Type:      System File.
 Weight:    Not weighted.
-Mode:      Compression off.
-
+Mode:      Compression on.
 +--------+-------------+---+
 |Variable|Description  |Pos|
 |        |             |iti|
@@ -102,7 +106,6 @@ Mode:      Compression off.
 +--------+-------------+---+
 |name    |Format: A10  |  2|
 +--------+-------------+---+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi