alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dve2: use postprocessor to simplify the code.

Browse source 
* iface/dve2/dve2check.cc: Use postprocessor to simplify the code.
* iface/dve2/dve2check.test: Adjust to some different output values
when a counterexample is found, caused by nondeterminism introduced by
the orders of transitions.
This commit is contained in:
Alexandre Duret-Lutz 2012-09-21 14:16:07 +02:00
parent 09b540315a
commit 40de47f159
2 changed files with 35 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

12
iface/dve2/dve2check.test
View file

@ -39,13 +39,15 @@ for opt in '' '-z'; do
# time with valgrind.).
../dve2check $opt -E $srcdir/beem-peterson.4.dve \
'!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)'
run 0 ../dve2check $opt -e $srcdir/beem-peterson.4.dve \
'!G(P_0.wait -> F P_0.CS)' | grep -v pages > stdout1
'!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)' \
| grep -v pages > stdout1
# same formula, different syntax.
run 0 ../dve2check $opt -e $srcdir/beem-peterson.4.dve \
'!G("P_0 == wait" -> F "P_0 == CS")' | grep -v pages > stdout2
../dve2check $opt -E $srcdir/beem-peterson.4.dve \
'!GF("P_0==CS"|"P_1 == CS"|"P_2 ==CS"|"P_3== CS")' \
| grep -v pages > stdout2
cmp stdout1 stdout2
run 0 ../dve2check $opt -e $srcdir/beem-peterson.4.dve \
'!G(P_0.wait -> F P_0.CS)'
run 0 ../dve2check $opt -e $srcdir/beem-peterson.4.dve '!G("pos[1] < 3")'
done