X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fcomment-at-eof.sh;h=617659b34ee44e8d382e9be157151fd1a11d0c87;hb=6497384e745ce6e67776bf6c5ce8bf108bc57cbc;hp=6f6ff259c392efb3bbcbd8c85e8dff18a136e000;hpb=b7852df2743416201dc85fd672644799cdd1b7b5;p=pspp diff --git a/tests/bugs/comment-at-eof.sh b/tests/bugs/comment-at-eof.sh index 6f6ff259c3..617659b34e 100755 --- a/tests/bugs/comment-at-eof.sh +++ b/tests/bugs/comment-at-eof.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 } @@ -53,7 +59,7 @@ COMMENT this is a comment at end of file. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/foo.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/foo.sps if [ $? -ne 0 ] ; then fail; fi pass;