Checkin of new directory structure.

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

diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh
index 34acd488fe4afc77b83cc14e0a8d0e6987e4f27b..17969c5ee4e8aee4e0a47093c0c7182faac0b058 100755 (executable)
--- a/tests/command/sysfile-info.sh
+++ b/tests/command/sysfile-info.sh
@@ -5,10 +5,13 @@
 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`
 
 # 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
@@ -68,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="filter output"
@@ -77,15 +80,14 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/out-filtered
-diff -b -w $TEMPDIR/out-filtered - << EOF |perl -e 's/^\s*$//g'
-1.1 DATA LIST.  Reading free-form data from the command file.
+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.
@@ -94,7 +96,6 @@ Cases:     3
 Type:      System File.
 Weight:    Not weighted.
 Mode:      Compression off.
-
 +--------+-------------+---+
 |Variable|Description  |Pos|
 |        |             |iti|
@@ -104,7 +105,6 @@ Mode:      Compression off.
 +--------+-------------+---+
 |name    |Format: A10  |  2|
 +--------+-------------+---+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi