X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-indep-missing-list.sh;h=ec97144d22c3ad82e5a70d36a97d4580ccbd2c71;hb=dbf12b0ee6a99119c6854a663184f8df4f4c5241;hp=6e473d91ec1408fae739bdaf655252f95a261a1a;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp-builds.git diff --git a/tests/command/t-test-indep-missing-list.sh b/tests/command/t-test-indep-missing-list.sh index 6e473d91..ec97144d 100755 --- a/tests/command/t-test-indep-missing-list.sh +++ b/tests/command/t-test-indep-missing-list.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 } @@ -66,7 +71,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" @@ -91,7 +96,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