X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fagg_crash.sh;h=43fd9f8c47a13bca00092282932b59ccab028016;hb=89306c3c6b335e23a09bc2c3442d8b08e60cb328;hp=0cadfe2c267c86e21bcbb64ab90ce6b5802bda30;hpb=2990bac9e19a4a92606c830ab39ef3eb1e555481;p=pspp-builds.git diff --git a/tests/bugs/agg_crash.sh b/tests/bugs/agg_crash.sh index 0cadfe2c..43fd9f8c 100755 --- a/tests/bugs/agg_crash.sh +++ b/tests/bugs/agg_crash.sh @@ -6,16 +6,26 @@ 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() { + if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then + echo "NOT cleaning $TEMPDIR" + return ; + fi + cd / rm -rf $TEMPDIR } @@ -66,7 +76,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # So this will have a non zero error status. # But it shouldn't crash! activity="run_program" -$SUPERVISOR $here/../src/pspp $TESTFILE > /dev/null +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi