X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fcurtailed.sh;h=86acddf5c92c094758753d671472c2ce83115ece;hb=f5574c6264163859a8eb94ab1e33bcc1b61fce5f;hp=a004ce590351fdf4113e23fa4374afaabc87ec9d;hpb=3a66b403c8856da07a1de12c96e163971909e29a;p=pspp-builds.git diff --git a/tests/bugs/curtailed.sh b/tests/bugs/curtailed.sh index a004ce59..86acddf5 100755 --- a/tests/bugs/curtailed.sh +++ b/tests/bugs/curtailed.sh @@ -6,16 +6,22 @@ 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` -export STAT_CONFIG_PATH=$top_srcdir/config +STAT_CONFIG_PATH=$top_srcdir/config +export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } @@ -64,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 -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi