X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fmatch-files-scratch.sh;h=9303f4f50bb30cecb5fbbe861c90d3b8d530790f;hb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;hp=c36bc9ad3ed106018dc68833a8c59e368e1c81da;hpb=9f7fa95f59daac4c6c3dda9b0c59367d976970be;p=pspp diff --git a/tests/bugs/match-files-scratch.sh b/tests/bugs/match-files-scratch.sh index c36bc9ad3e..9303f4f50b 100755 --- a/tests/bugs/match-files-scratch.sh +++ b/tests/bugs/match-files-scratch.sh @@ -7,10 +7,13 @@ TEMPDIR=/tmp/pspp-tst-$$ TESTFILE=$TEMPDIR/`basename $0`.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` # 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 @@ -70,13 +73,13 @@ FINISH. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list diff -b -w $TEMPDIR/pspp.list - << EOF -1.1 DATA LIST. Reading free-form data from the command file. +1.1 DATA LIST. Reading free-form data from INLINE. +--------+------+ |Variable|Format| #========#======#