Checkin of new directory structure.

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

diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh
index 54c74daa60aaf61c187c7dc878cffc437b35975d..8ab912634edca835270e96f28e32a84430c72c06 100755 (executable)
--- a/tests/command/oneway.sh
+++ b/tests/command/oneway.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
@@ -89,7 +92,7 @@ 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
 
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list