X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-indep-missing-anal.sh;h=6719faf851b1558af59fe1fb3811c169647b9c36;hb=0188d216a999f6f45ccb98f6ee40bb82c13ac7fd;hp=fdcccda1795f651b2164ae0712739971ff0c7b6a;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp-builds.git diff --git a/tests/command/t-test-indep-missing-anal.sh b/tests/command/t-test-indep-missing-anal.sh index fdcccda1..6719faf8 100755 --- a/tests/command/t-test-indep-missing-anal.sh +++ b/tests/command/t-test-indep-missing-anal.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 activity="run program 1" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -93,7 +98,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi