X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fhtml-frequency.sh;h=789fe32c74766ade1f606d060375ce049ba50858;hb=af4066391f20365e210460a736b1b02efe194da6;hp=e3df6fdeddc10d0a1ae6741cdb40c01aa77dacf1;hpb=44d7b18d5c3d0a806fe1a29658445254f2376600;p=pspp diff --git a/tests/bugs/html-frequency.sh b/tests/bugs/html-frequency.sh index e3df6fdedd..789fe32c74 100755 --- a/tests/bugs/html-frequency.sh +++ b/tests/bugs/html-frequency.sh @@ -8,7 +8,11 @@ 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` @@ -18,6 +22,10 @@ export STAT_CONFIG_PATH cleanup() { + if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then + echo "NOT cleaning $TEMPDIR" + return ; + fi cd / rm -rf $TEMPDIR } @@ -69,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi cd $TEMPDIR activity="run data" -$SUPERVISOR $here/../src/pspp -o html $TESTFILE +$SUPERVISOR $PSPP -o html $TESTFILE if [ $? -ne 0 ] ; then fail ; fi