X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fstats%2Fntiles.sh;h=66b49a75181fa7090bc0c91640b846271004b4c6;hb=6497384e745ce6e67776bf6c5ce8bf108bc57cbc;hp=35d4af737deba3186d1aad520814c701b39254c5;hpb=26a2fc80cb850d182030635c3720fbb6db40ae70;p=pspp diff --git a/tests/stats/ntiles.sh b/tests/stats/ntiles.sh index 35d4af737d..66b49a7518 100755 --- a/tests/stats/ntiles.sh +++ b/tests/stats/ntiles.sh @@ -4,16 +4,22 @@ TEMPDIR=/tmp/pspp-tst-$$ -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` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute -cd $top_srcdir; top_srcdir=`pwd` +top_srcdir=`cd $top_srcdir; pwd` -export STAT_CONFIG_PATH=$top_srcdir/config +STAT_CONFIG_PATH=$top_srcdir/config +export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR : } @@ -68,7 +74,7 @@ EOF if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="move output" @@ -97,7 +103,7 @@ EOF if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output"