diff --git a/ChangeLog b/ChangeLog index abc4a6f9a..643459091 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-05-14 Alexandre Duret-Lutz + + * src/ltltest/reduc.test: Use ./defs and clean result.data. + * src/ltltest/Makefile.am (CLEANFILES): Clean result.data. + 2004-05-13 Thomas Martinez * src/ltlvisit/Makefile.am: Copyright 2004. diff --git a/src/ltltest/Makefile.am b/src/ltltest/Makefile.am index 63e596543..a18745e41 100644 --- a/src/ltltest/Makefile.am +++ b/src/ltltest/Makefile.am @@ -72,4 +72,4 @@ TESTS = \ inf.test \ reduc.test -CLEANFILES = stdout expect parse.dot +CLEANFILES = stdout expect parse.dot result.data diff --git a/src/ltltest/reduc.test b/src/ltltest/reduc.test index d01898701..7b8d5db6e 100755 --- a/src/ltltest/reduc.test +++ b/src/ltltest/reduc.test @@ -22,38 +22,31 @@ # Check for the reduc visitor. - -#. ./defs || exit 1 +. ./defs || exit 1 set -e -#FICH=${1-$srcdir/formules.ltl} -FICH=${1-formules.ltl} +FICH=${1-$srcdir/formules.ltl} -##################################### - -for opt in 0 1 2 3 - do +for opt in 0 1 2 3; do rm -f result.data - + cat $FICH | while read f; do if [ -n "$f" ] && [ "$f" != "####" ]; then ./reduc $opt "$f" >> result.data fi done - + test $? == 0 || exit 1 - -##################################### - + perl -ne 'BEGIN { $sum1 = 0; $sum2 = 0; } /^(\d+)\s+(\d+)/; $sum1 += $1; $sum2 += $2; END { print 100 - ($sum2 * 100 / $sum1); print "\n"; } ' < result.data - + done -##################################### +rm -f result.data