Checkin of new directory structure.

[pspp-builds.git] / tests / command / sysfiles.sh

diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh
index 0dd6c5fe74bee9c599665c6524830ec72c23f916..780710dc7df6c788c92f3c8fd3b1b37d96260db1 100755 (executable)
--- a/tests/command/sysfiles.sh
+++ b/tests/command/sysfiles.sh
@@ -7,10 +7,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
@@ -75,12 +78,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
 variable001 variable002 variable003 variable004
 ----------- ----------- ----------- -----------
        1.00        1.00        1.00        2.00  
@@ -91,7 +94,6 @@ variable001 variable002 variable003 variable004
        2.00        1.00        2.00      22.00 
        2.00        2.00        1.00       1.00 
        2.00        2.00        2.00       3.00 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi