X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Faggregate.sh;h=c03852ecd702d5bc05f3289f38cceb9f7c09b31f;hb=e1ca4ab566c6f8317ba8ff0fd27046b82b4acd63;hp=b84e63eb30b04b61bff1e8ad6a9799188229d9d4;hpb=c1edead52e3b254bc305afd1d647b94bd10ca5d4;p=pspp diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh index b84e63eb30..c03852ecd7 100755 --- a/tests/command/aggregate.sh +++ b/tests/command/aggregate.sh @@ -3,12 +3,15 @@ # This program tests the aggregate procedure TEMPDIR=/tmp/pspp-tst-$$ +TESTFILE=$TEMPDIR/`basename $0`.sps + here=`pwd`; # ensure that top_srcdir is absolute cd $top_srcdir; top_srcdir=`pwd` + export STAT_CONFIG_PATH=$top_srcdir/config cleanup() @@ -45,7 +48,7 @@ mkdir -p $TEMPDIR cd $TEMPDIR activity="program create" -cat > $TEMPDIR/test.sps << EOF +cat > $TESTFILE << EOF data list notable /x y 1-2. begin data. @@ -68,12 +71,11 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$here/../src/pspp -o raw-ascii $TEMPDIR/test.sps +$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi - activity="test result" -diff -B $TEMPDIR/pspp.list - << EOF +diff -b -w -B $TEMPDIR/pspp.list - << EOF X Z FOO - -------- -------- 1 15.00 6.00