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

modelcheck: rewrite and use argp

Browse source 
* tests/Makefile.am, tests/ltsmin/check.test,
tests/ltsmin/finite.test, tests/ltsmin/finite2.test,
tests/ltsmin/kripke.test, tests/ltsmin/modelcheck.cc: here.
This commit is contained in:
Etienne Renault 2016-03-10 13:27:42 +01:00
parent b4bbf50794
commit 4337abc5a6
6 changed files with 355 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

50
tests/ltsmin/check.test
View file

@ -1,6 +1,6 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2011, 2012, 2014, 2015, 2016 Laboratoire de Recherche
# Copyright (C) 2011, 2012, 2014, 2015, 2016, 2017 Laboratoire de Recherche
# et Développement de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -32,37 +32,43 @@ fi
set -e
for opt in '' '-z'; do
# Promela
for opt in '' '--compress 1'; do
run 0 ../modelcheck --is-emtpy $opt --model $srcdir/elevator2.1.pm \
--formula '!G("req[1]==1" -> (F("p==1" && "cabin_0._pc==2")))'
run 1 ../modelcheck --is-empty $opt --model $srcdir/elevator2.1.pm \
--formula 'F("p==2")'
done
# dve2
for opt in '' '--compress 1'; do
# The three examples from the README.
# (Don't run the first one using "run 0" because it would take too much
# time with valgrind.).
../modelcheck $opt -E $srcdir/beem-peterson.4.dve \
'!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)' \
| grep -v pages > stdout1
../modelcheck --is-empty $opt --model $srcdir/beem-peterson.4.dve \
--formula '!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)' \
| grep -v pages > stdout1
# same formula, different syntax.
../modelcheck $opt -E $srcdir/beem-peterson.4.dve \
'!GF("P_0==CS"|"P_1 == CS"|"P_2 ==CS"|"P_3== CS")' \
| grep -v pages > stdout2
../modelcheck --is-empty $opt --model $srcdir/beem-peterson.4.dve \
--formula '!GF("P_0==CS"|"P_1 == CS"|"P_2 ==CS"|"P_3== CS")' \
| grep -v pages > stdout2
cmp stdout1 stdout2
run 0 ../modelcheck $opt -e $srcdir/beem-peterson.4.dve \
'!G(P_0.wait -> F P_0.CS)'
run 0 ../modelcheck $opt -e $srcdir/beem-peterson.4.dve '!G("pos[1] < 3")'
run 1 ../modelcheck --is-empty $opt --model $srcdir/beem-peterson.4.dve \
--formula '!G(P_0.wait -> F P_0.CS)'
run 1 ../modelcheck --is-empty $opt --model $srcdir/beem-peterson.4.dve\
--formula '!G("pos[1] < 3")'
done
# Now check some error messages.
run 1 ../modelcheck foo.dve "F(P_0.CS)" 2>stderr
run 2 ../modelcheck --model foo.dve --formula "F(P_0.CS)" 2>stderr
cat stderr
grep 'Cannot open' stderr
# the dve2C file was generated in the current directory
run 1 ../modelcheck beem-peterson.4.dve2C \
'Xfoo | P_0.f & X"P_0.k < 2xx" | G"pos[0]"' 2>stderr
run 2 ../modelcheck --model beem-peterson.4.dve2C \
--formula 'Xfoo | P_0.f & X"P_0.k < 2xx" | G"pos[0]"' 2>stderr
cat stderr
grep 'variable `foo' stderr
grep "state \`f'.*P_0" stderr
grep "Unexpected.*\`xx'" stderr
grep 'Possible.*CS' stderr
grep 'Possible.*NCS' stderr
grep 'Possible.*q2' stderr
grep 'Possible.*q3' stderr
grep 'Possible.*wait' stderr
grep 'Proposition "foo"' stderr
grep 'Proposition "P_0.f"' stderr
grep 'Proposition "P_0.k<2xx"' stderr