Checkin of new directory structure.

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

diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh
index a7a8294fcf1b1f40f3f832599fcbfbe41a7bcdf8..36a9feffcd842f15ab2dc068cd11e634e2f96e92 100755 (executable)
--- a/tests/command/aggregate.sh
+++ b/tests/command/aggregate.sh
@@ -6,10 +6,11 @@ TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/aggregate.pspp
 
 
-here=`pwd`;
-
-# ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+# ensure that top_srcdir and top_builddir  are absolute
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+top_srcdir=`cd $top_srcdir; pwd`
+top_builddir=`cd $top_builddir; pwd`
 
 
 STAT_CONFIG_PATH=$top_srcdir/config
@@ -204,7 +205,7 @@ for outfile in scratch active external; do
            if [ $? -ne 0 ] ; then no_result ; fi
            
            activity="run $name.pspp"
-           $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $name.pspp >/dev/null 2>&1
+           $SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $name.pspp >/dev/null 2>&1
            if [ $? -ne 0 ] ; then no_result ; fi
 
            activity="check $name output"