X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Faggregate.sh;h=b85edba304dc7c32c21c2c4f921833a000b2cb30;hb=b021d5d4e83d3ac52ae1eb0490a75a561b0d7228;hp=a7a8294fcf1b1f40f3f832599fcbfbe41a7bcdf8;hpb=8c12d5a827a8499bcf0ab15dd3f265e245230e4b;p=pspp-builds.git

diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh
index a7a8294f..b85edba3 100755
--- a/tests/command/aggregate.sh
+++ b/tests/command/aggregate.sh
@@ -6,10 +6,12 @@ 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`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 
 STAT_CONFIG_PATH=$top_srcdir/config
@@ -204,7 +206,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 $PSPP --testing-mode -o raw-ascii $name.pspp >/dev/null 2>&1
 	    if [ $? -ne 0 ] ; then no_result ; fi
 
 	    activity="check $name output"