X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fmatch-files.sh;h=bb4107e58fd4962a9d1d14dba8a192c6201ccdf6;hb=68f08c4bb53fcde16035b622bdb6e9529f9cf3ae;hp=7864921f72d1208075422900440631495e7deef3;hpb=f62700038e9edd7d8002242015a900a15626bceb;p=pspp diff --git a/tests/command/match-files.sh b/tests/command/match-files.sh index 7864921f72..bb4107e58f 100755 --- a/tests/command/match-files.sh +++ b/tests/command/match-files.sh @@ -6,10 +6,14 @@ TEMPDIR=/tmp/pspp-tst-$$ TESTFILE=$TEMPDIR/match-files.pspp -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 @@ -78,40 +82,40 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi cat > ff.out < ft.out </dev/null 2>&1 + $SUPERVISOR $PSPP --testing-mode -e /dev/null $name.pspp if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output" @@ -186,12 +193,12 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run $name.pspp" -$SUPERVISOR $here/../src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1 +$SUPERVISOR $PSPP --testing-mode -e /dev/null $name.pspp if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output" perl -pi -e 's/^\s*$//g' pspp.list -diff -b -w - pspp.list </dev/null 2>&1 +$SUPERVISOR $PSPP --testing-mode -e /dev/null $name.pspp if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output"