X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fcurtailed.sh;h=9c46e9ffcdba3b1e418c37e0ed27120e78b0507a;hb=10e81be44094541d3ef632e6e89b8641ecfb91c6;hp=7b060a586c527853003f9a263726dfc7655bee56;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp diff --git a/tests/bugs/curtailed.sh b/tests/bugs/curtailed.sh index 7b060a586c..9c46e9ffcd 100755 --- a/tests/bugs/curtailed.sh +++ b/tests/bugs/curtailed.sh @@ -6,10 +6,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 @@ -17,6 +21,7 @@ export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } @@ -65,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi #This must fail activity="run program" -$SUPERVISOR $here/../src/pspp $TESTFILE > /dev/null +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi