X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fpermissions.sh;h=359efa1006829005aed576fcf76fbdf3a7cc0545;hb=2b1e8448aee0d326ad5c2f805c27ee4f39b4a447;hp=5283b209288a531378b08db31c13a080271f4a19;hpb=44d7b18d5c3d0a806fe1a29658445254f2376600;p=pspp-builds.git diff --git a/tests/command/permissions.sh b/tests/command/permissions.sh index 5283b209..359efa10 100755 --- a/tests/command/permissions.sh +++ b/tests/command/permissions.sh @@ -5,10 +5,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 @@ -62,7 +66,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/per.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/per.sps if [ $? -ne 0 ] ; then no_result ; fi activity="Check Permissions" @@ -78,7 +82,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/per.sps +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/per.sps if [ $? -ne 0 ] ; then no_result ; fi activity="Check Permissions"