X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-pairs.sh;h=f657e8fb2cdb3259223603bbc8cb79d2f89d6cb4;hb=b9f6480f1b451cb7873bb0591369504ff1b92595;hp=dd2d14ae00546d89e986f47b896af1b5a0316d68;hpb=053e7ff6e0a45a25d5604b211e9c950fff50e75d;p=pspp-builds.git diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh index dd2d14ae..f657e8fb 100755 --- a/tests/command/t-test-pairs.sh +++ b/tests/command/t-test-pairs.sh @@ -5,10 +5,14 @@ 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` +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` STAT_CONFIG_PATH=$top_srcdir/config export STAT_CONFIG_PATH @@ -65,7 +69,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" @@ -96,7 +100,7 @@ diff -b $TEMPDIR/pspp.list - <