Checkin of new directory structure.

[pspp-builds.git] / tests / bugs / compute-lv.sh

diff --git a/tests/bugs/compute-lv.sh b/tests/bugs/compute-lv.sh
index c1b4fec57ee07830dbc9156ddcda24013a8e52b9..6b7b70b1e85192f92f52835eae0580d63d50bb9b 100755 (executable)
--- a/tests/bugs/compute-lv.sh
+++ b/tests/bugs/compute-lv.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
@@ -66,21 +69,20 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run prog"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare output"
 perl -pi -e 's/^\s*$//g' pspp.list
-diff -b pspp.list - << EOF |perl -e 's/^\s*$//g'
-1.1 DATA LIST.  Reading free-form data from the command file.
+diff -b pspp.list - << EOF
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +----------------+------+
 |    Variable    |Format|
 #================#======#
 |longVariablename|F8.0  |
 |x               |F8.0  |
 +----------------+------+
-
 longVariablename        x
 ---------------- -------- 
            99.00     2.00