X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fexpressions%2Fvariables.sh;h=b9da30fb0b9489e98cedf016906bd8f3ae107d3b;hb=d94b00b8d019bb2fda05366a2e86505fff13dbe3;hp=444274e9fa1db75965c3e66fb18f53c4ed89b354;hpb=b08603f631a2d998d8c604692fdf13669bb5e510;p=pspp-builds.git diff --git a/tests/expressions/variables.sh b/tests/expressions/variables.sh index 444274e9..b9da30fb 100755 --- a/tests/expressions/variables.sh +++ b/tests/expressions/variables.sh @@ -4,14 +4,18 @@ TEMPDIR=/tmp/pspp-tst-$$ -here=`pwd`; - -# ensure that top_srcdir is absolute -cd $top_srcdir; top_srcdir=`pwd` +# ensure that top_srcdir and top_builddir are absolute +if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi +if [ -z "$top_builddir" ] ; then top_builddir=. ; fi +top_srcdir=`cd $top_srcdir; pwd` +top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp STAT_CONFIG_PATH=$top_srcdir/config export STAT_CONFIG_PATH +LANG=C +export LANG cleanup() { @@ -93,13 +97,13 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/variables.stat > $TEMPDIR/variables.err 2> $TEMPDIR/variables.out +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/variables.stat > $TEMPDIR/variables.err 2> $TEMPDIR/variables.out if [ $? -ne 0 ] ; then fail ; fi activity="compare results" -perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list -diff -b $TEMPDIR/pspp.list - <