X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fexpressions%2Fvectors.sh;h=6e7243bf321e30c34754ce8e7faac80ea0d756e4;hb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;hp=0c2239177e5f64eda18b05cf78aa3459ba8e7a97;hpb=ece7245b6bf64b2d3d8a50472d18bbe176c982d4;p=pspp-builds.git diff --git a/tests/expressions/vectors.sh b/tests/expressions/vectors.sh index 0c223917..6e7243bf 100755 --- a/tests/expressions/vectors.sh +++ b/tests/expressions/vectors.sh @@ -4,10 +4,11 @@ TEMPDIR=/tmp/pspp-tst-$$ -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 export STAT_CONFIG_PATH @@ -69,7 +70,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/vectors.stat > $TEMPDIR/vectors.err 2> $TEMPDIR/vectors.out +$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/vectors.stat > $TEMPDIR/vectors.err 2> $TEMPDIR/vectors.out if [ $? -ne 0 ] ; then fail ; fi activity="compare results"