Merge the core and python tests in the tests/ directory
* tests/: Rename as... * tests/core/: ... this. * python/tests/: Rename as... * tests/python/: ... this. * python/tests/run.in: Move as... * tests/run.in: This, and adjust. * tests/Makefile.am: Adjust to run both core and python tests. * configure.ac, README, debian/python3-spot.examples, debian/rules, doc/org/tut.org, python/Makefile.am, spot/ltsmin/Makefile.am, spot/ltsmin/kripke.test, spot/sanity/ipynb.test: Adjust.
This commit is contained in:
Alexandre Duret-Lutz
parent
18572db39f
commit
5cb94a1a3f
197 changed files with 734 additions and 715 deletions
|
|
@ -20,234 +20,282 @@
|
|||
## You should have received a copy of the GNU General Public License
|
||||
## along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS)
|
||||
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
|
||||
LDADD = $(top_builddir)/spot/libspot.la
|
||||
|
||||
# These are the most used test programs, and they are also useful
|
||||
# to run manually outside the test suite. Always build them.
|
||||
noinst_PROGRAMS = ikwiad randtgba
|
||||
noinst_PROGRAMS = core/ikwiad core/randtgba
|
||||
|
||||
TEST_EXTENTIONS = .test .py .ipynb
|
||||
|
||||
LOG_COMPILER = ./run
|
||||
TEST_LOG_COMPILER = ./run
|
||||
LOG_DRIVER = $(TEST_LOG_DRIVER)
|
||||
# ensure run is rebuilt before the tests are run.
|
||||
check_SCRIPTS = run core/defs
|
||||
|
||||
check_SCRIPTS = defs
|
||||
# Keep this sorted alphabetically.
|
||||
check_PROGRAMS = \
|
||||
acc \
|
||||
bitvect \
|
||||
complement \
|
||||
checkpsl \
|
||||
checkta \
|
||||
consterm \
|
||||
emptchk \
|
||||
equals \
|
||||
graph \
|
||||
kind \
|
||||
length \
|
||||
intvcomp \
|
||||
intvcmp2 \
|
||||
ltlprod \
|
||||
ltl2dot \
|
||||
ltl2text \
|
||||
ltlrel \
|
||||
lunabbrev \
|
||||
nequals \
|
||||
nenoform \
|
||||
ngraph \
|
||||
parse_print \
|
||||
readsat \
|
||||
reduc \
|
||||
reduccmp \
|
||||
reduceu \
|
||||
reductaustr \
|
||||
syntimpl \
|
||||
taatgba \
|
||||
tgbagraph \
|
||||
tostring \
|
||||
tunabbrev \
|
||||
tunenoform
|
||||
core/acc \
|
||||
core/bitvect \
|
||||
core/complement \
|
||||
core/checkpsl \
|
||||
core/checkta \
|
||||
core/consterm \
|
||||
core/emptchk \
|
||||
core/equals \
|
||||
core/graph \
|
||||
core/kind \
|
||||
core/length \
|
||||
core/intvcomp \
|
||||
core/intvcmp2 \
|
||||
core/ltlprod \
|
||||
core/ltl2dot \
|
||||
core/ltl2text \
|
||||
core/ltlrel \
|
||||
core/lunabbrev \
|
||||
core/nequals \
|
||||
core/nenoform \
|
||||
core/ngraph \
|
||||
core/parse_print \
|
||||
core/readsat \
|
||||
core/reduc \
|
||||
core/reduccmp \
|
||||
core/reduceu \
|
||||
core/reductaustr \
|
||||
core/syntimpl \
|
||||
core/taatgba \
|
||||
core/tgbagraph \
|
||||
core/tostring \
|
||||
core/tunabbrev \
|
||||
core/tunenoform
|
||||
|
||||
# Keep this sorted alphabetically.
|
||||
acc_SOURCES = acc.cc
|
||||
bitvect_SOURCES = bitvect.cc
|
||||
checkpsl_SOURCES = checkpsl.cc
|
||||
checkta_SOURCES = checkta.cc
|
||||
complement_SOURCES = complementation.cc
|
||||
emptchk_SOURCES = emptchk.cc
|
||||
graph_SOURCES = graph.cc
|
||||
ikwiad_SOURCES = ikwiad.cc
|
||||
intvcomp_SOURCES = intvcomp.cc
|
||||
intvcmp2_SOURCES = intvcmp2.cc
|
||||
ltlprod_SOURCES = ltlprod.cc
|
||||
ngraph_SOURCES = ngraph.cc
|
||||
parse_print_SOURCES = parse_print_test.cc
|
||||
randtgba_SOURCES = randtgba.cc
|
||||
readsat_SOURCES = readsat.cc
|
||||
taatgba_SOURCES = taatgba.cc
|
||||
tgbagraph_SOURCES = twagraph.cc
|
||||
consterm_SOURCES = consterm.cc
|
||||
equals_SOURCES = equalsf.cc
|
||||
kind_SOURCES = kind.cc
|
||||
length_SOURCES = length.cc
|
||||
ltl2dot_SOURCES = readltl.cc
|
||||
ltl2dot_CPPFLAGS = $(AM_CPPFLAGS) -DDOTTY
|
||||
ltl2text_SOURCES = readltl.cc
|
||||
ltlrel_SOURCES = ltlrel.cc
|
||||
lunabbrev_SOURCES = equalsf.cc
|
||||
lunabbrev_CPPFLAGS = $(AM_CPPFLAGS) -DUNABBREV='"^ie"'
|
||||
nenoform_SOURCES = equalsf.cc
|
||||
nenoform_CPPFLAGS = $(AM_CPPFLAGS) -DNENOFORM
|
||||
nequals_SOURCES = equalsf.cc
|
||||
nequals_CPPFLAGS = $(AM_CPPFLAGS) -DNEGATE
|
||||
reduc_SOURCES = reduc.cc
|
||||
reduccmp_SOURCES = equalsf.cc
|
||||
reduccmp_CPPFLAGS = $(AM_CPPFLAGS) -DREDUC
|
||||
reduceu_SOURCES = equalsf.cc
|
||||
reduceu_CPPFLAGS = $(AM_CPPFLAGS) -DREDUC -DEVENT_UNIV
|
||||
reductaustr_SOURCES = equalsf.cc
|
||||
reductaustr_CPPFLAGS = $(AM_CPPFLAGS) -DREDUC_TAUSTR
|
||||
syntimpl_SOURCES = syntimpl.cc
|
||||
tostring_SOURCES = tostring.cc
|
||||
tunabbrev_SOURCES = equalsf.cc
|
||||
tunabbrev_CPPFLAGS = $(AM_CPPFLAGS) -DUNABBREV='"^ieFG"'
|
||||
tunenoform_SOURCES = equalsf.cc
|
||||
tunenoform_CPPFLAGS = $(AM_CPPFLAGS) -DNENOFORM -DUNABBREV='"^ieFG"'
|
||||
core_acc_SOURCES = core/acc.cc
|
||||
core_bitvect_SOURCES = core/bitvect.cc
|
||||
core_checkpsl_SOURCES = core/checkpsl.cc
|
||||
core_checkta_SOURCES = core/checkta.cc
|
||||
core_complement_SOURCES = core/complementation.cc
|
||||
core_emptchk_SOURCES = core/emptchk.cc
|
||||
core_graph_SOURCES = core/graph.cc
|
||||
core_ikwiad_SOURCES = core/ikwiad.cc
|
||||
core_intvcomp_SOURCES = core/intvcomp.cc
|
||||
core_intvcmp2_SOURCES = core/intvcmp2.cc
|
||||
core_ltlprod_SOURCES = core/ltlprod.cc
|
||||
core_ngraph_SOURCES = core/ngraph.cc
|
||||
core_parse_print_SOURCES = core/parse_print_test.cc
|
||||
core_randtgba_SOURCES = core/randtgba.cc
|
||||
core_readsat_SOURCES = core/readsat.cc
|
||||
core_taatgba_SOURCES = core/taatgba.cc
|
||||
core_tgbagraph_SOURCES = core/twagraph.cc
|
||||
core_consterm_SOURCES = core/consterm.cc
|
||||
core_equals_SOURCES = core/equalsf.cc
|
||||
core_kind_SOURCES = core/kind.cc
|
||||
core_length_SOURCES = core/length.cc
|
||||
core_ltl2dot_SOURCES = core/readltl.cc
|
||||
core_ltl2dot_CPPFLAGS = $(AM_CPPFLAGS) -DDOTTY
|
||||
core_ltl2text_SOURCES = core/readltl.cc
|
||||
core_ltlrel_SOURCES = core/ltlrel.cc
|
||||
core_lunabbrev_SOURCES = core/equalsf.cc
|
||||
core_lunabbrev_CPPFLAGS = $(AM_CPPFLAGS) -DUNABBREV='"^ie"'
|
||||
core_nenoform_SOURCES = core/equalsf.cc
|
||||
core_nenoform_CPPFLAGS = $(AM_CPPFLAGS) -DNENOFORM
|
||||
core_nequals_SOURCES = core/equalsf.cc
|
||||
core_nequals_CPPFLAGS = $(AM_CPPFLAGS) -DNEGATE
|
||||
core_reduc_SOURCES = core/reduc.cc
|
||||
core_reduccmp_SOURCES = core/equalsf.cc
|
||||
core_reduccmp_CPPFLAGS = $(AM_CPPFLAGS) -DREDUC
|
||||
core_reduceu_SOURCES = core/equalsf.cc
|
||||
core_reduceu_CPPFLAGS = $(AM_CPPFLAGS) -DREDUC -DEVENT_UNIV
|
||||
core_reductaustr_SOURCES = core/equalsf.cc
|
||||
core_reductaustr_CPPFLAGS = $(AM_CPPFLAGS) -DREDUC_TAUSTR
|
||||
core_syntimpl_SOURCES = core/syntimpl.cc
|
||||
core_tostring_SOURCES = core/tostring.cc
|
||||
core_tunabbrev_SOURCES = core/equalsf.cc
|
||||
core_tunabbrev_CPPFLAGS = $(AM_CPPFLAGS) -DUNABBREV='"^ieFG"'
|
||||
core_tunenoform_SOURCES = core/equalsf.cc
|
||||
core_tunenoform_CPPFLAGS = $(AM_CPPFLAGS) -DNENOFORM -DUNABBREV='"^ieFG"'
|
||||
|
||||
|
||||
# Keep this sorted by STRENGTH. Test basic things first,
|
||||
# because such failures will be easier to diagnose and fix.
|
||||
TESTS = $(TESTS_ltl) $(TESTS_graph) $(TESTS_kripke) $(TESTS_twa)
|
||||
TESTS = $(TESTS_tl) $(TESTS_graph) $(TESTS_kripke) $(TESTS_twa) $(TESTS_python)
|
||||
|
||||
TESTS_ltl = \
|
||||
bare.test \
|
||||
parse.test \
|
||||
parseerr.test \
|
||||
utf8.test \
|
||||
length.test \
|
||||
equals.test \
|
||||
tostring.test \
|
||||
lunabbrev.test \
|
||||
tunabbrev.test \
|
||||
nenoform.test \
|
||||
tunenoform.test \
|
||||
unabbrevwm.test \
|
||||
consterm.test \
|
||||
kind.test \
|
||||
remove_x.test \
|
||||
ltlrel.test \
|
||||
ltlgrind.test \
|
||||
ltlcrossgrind.test \
|
||||
ltlfilt.test \
|
||||
exclusive-ltl.test \
|
||||
latex.test \
|
||||
lbt.test \
|
||||
lenient.test \
|
||||
rand.test \
|
||||
isop.test \
|
||||
syntimpl.test \
|
||||
reduc.test \
|
||||
reduc0.test \
|
||||
reducpsl.test \
|
||||
reduccmp.test \
|
||||
uwrm.test \
|
||||
eventuniv.test \
|
||||
stutter-ltl.test
|
||||
TESTS_tl = \
|
||||
core/bare.test \
|
||||
core/parse.test \
|
||||
core/parseerr.test \
|
||||
core/utf8.test \
|
||||
core/length.test \
|
||||
core/equals.test \
|
||||
core/tostring.test \
|
||||
core/lunabbrev.test \
|
||||
core/tunabbrev.test \
|
||||
core/nenoform.test \
|
||||
core/tunenoform.test \
|
||||
core/unabbrevwm.test \
|
||||
core/consterm.test \
|
||||
core/kind.test \
|
||||
core/remove_x.test \
|
||||
core/ltlrel.test \
|
||||
core/ltlgrind.test \
|
||||
core/ltlcrossgrind.test \
|
||||
core/ltlfilt.test \
|
||||
core/exclusive-ltl.test \
|
||||
core/latex.test \
|
||||
core/lbt.test \
|
||||
core/lenient.test \
|
||||
core/rand.test \
|
||||
core/isop.test \
|
||||
core/syntimpl.test \
|
||||
core/reduc.test \
|
||||
core/reduc0.test \
|
||||
core/reducpsl.test \
|
||||
core/reduccmp.test \
|
||||
core/uwrm.test \
|
||||
core/eventuniv.test \
|
||||
core/stutter-ltl.test
|
||||
|
||||
TESTS_graph = \
|
||||
graph.test \
|
||||
ngraph.test \
|
||||
tgbagraph.test
|
||||
core/graph.test \
|
||||
core/ngraph.test \
|
||||
core/tgbagraph.test
|
||||
|
||||
TESTS_kripke = \
|
||||
kripke.test
|
||||
core/kripke.test
|
||||
|
||||
TESTS_twa = \
|
||||
acc.test \
|
||||
acc2.test \
|
||||
intvcomp.test \
|
||||
bitvect.test \
|
||||
ltlcross3.test \
|
||||
taatgba.test \
|
||||
renault.test \
|
||||
nondet.test \
|
||||
det.test \
|
||||
neverclaimread.test \
|
||||
parseaut.test \
|
||||
optba.test \
|
||||
complete.test \
|
||||
complement.test \
|
||||
remfin.test \
|
||||
dstar.test \
|
||||
readsave.test \
|
||||
ltldo.test \
|
||||
ltldo2.test \
|
||||
maskacc.test \
|
||||
maskkeep.test \
|
||||
prodor.test \
|
||||
simdet.test \
|
||||
sim2.test \
|
||||
sim3.test \
|
||||
ltl2tgba.test \
|
||||
ltl2neverclaim.test \
|
||||
ltl2neverclaim-lbtt.test \
|
||||
ltlprod.test \
|
||||
explprod.test \
|
||||
explpro2.test \
|
||||
explpro3.test \
|
||||
explpro4.test \
|
||||
tripprod.test \
|
||||
dupexp.test \
|
||||
exclusive-tgba.test \
|
||||
remprop.test \
|
||||
degendet.test \
|
||||
degenid.test \
|
||||
degenlskip.test \
|
||||
randomize.test \
|
||||
lbttparse.test \
|
||||
scc.test \
|
||||
sccdot.test \
|
||||
sccsimpl.test \
|
||||
sepsets.test \
|
||||
dbacomp.test \
|
||||
obligation.test \
|
||||
wdba.test \
|
||||
wdba2.test \
|
||||
babiak.test \
|
||||
monitor.test \
|
||||
dra2dba.test \
|
||||
unambig.test \
|
||||
ltlcross4.test \
|
||||
ltl3dra.test \
|
||||
ltl2dstar.test \
|
||||
ltl2dstar2.test \
|
||||
ltl2dstar3.test \
|
||||
ltl2dstar4.test \
|
||||
ltl2ta.test \
|
||||
ltl2ta2.test \
|
||||
randaut.test \
|
||||
randtgba.test \
|
||||
isomorph.test \
|
||||
uniq.test \
|
||||
sbacc.test \
|
||||
stutter-tgba.test \
|
||||
strength.test \
|
||||
emptchk.test \
|
||||
emptchke.test \
|
||||
dfs.test \
|
||||
ltlcrossce.test \
|
||||
ltlcrossce2.test \
|
||||
emptchkr.test \
|
||||
ltlcounter.test \
|
||||
basimul.test \
|
||||
satmin.test \
|
||||
satmin2.test \
|
||||
spotlbtt.test \
|
||||
ltlcross.test \
|
||||
spotlbtt2.test \
|
||||
ltlcross2.test \
|
||||
complementation.test \
|
||||
randpsl.test \
|
||||
cycles.test
|
||||
|
||||
EXTRA_DIST = $(TESTS)
|
||||
core/acc.test \
|
||||
core/acc2.test \
|
||||
core/intvcomp.test \
|
||||
core/bitvect.test \
|
||||
core/ltlcross3.test \
|
||||
core/taatgba.test \
|
||||
core/renault.test \
|
||||
core/nondet.test \
|
||||
core/det.test \
|
||||
core/neverclaimread.test \
|
||||
core/parseaut.test \
|
||||
core/optba.test \
|
||||
core/complete.test \
|
||||
core/complement.test \
|
||||
core/remfin.test \
|
||||
core/dstar.test \
|
||||
core/readsave.test \
|
||||
core/ltldo.test \
|
||||
core/ltldo2.test \
|
||||
core/maskacc.test \
|
||||
core/maskkeep.test \
|
||||
core/prodor.test \
|
||||
core/simdet.test \
|
||||
core/sim2.test \
|
||||
core/sim3.test \
|
||||
core/ltl2tgba.test \
|
||||
core/ltl2neverclaim.test \
|
||||
core/ltl2neverclaim-lbtt.test \
|
||||
core/ltlprod.test \
|
||||
core/explprod.test \
|
||||
core/explpro2.test \
|
||||
core/explpro3.test \
|
||||
core/explpro4.test \
|
||||
core/tripprod.test \
|
||||
core/dupexp.test \
|
||||
core/exclusive-tgba.test \
|
||||
core/remprop.test \
|
||||
core/degendet.test \
|
||||
core/degenid.test \
|
||||
core/degenlskip.test \
|
||||
core/randomize.test \
|
||||
core/lbttparse.test \
|
||||
core/scc.test \
|
||||
core/sccdot.test \
|
||||
core/sccsimpl.test \
|
||||
core/sepsets.test \
|
||||
core/dbacomp.test \
|
||||
core/obligation.test \
|
||||
core/wdba.test \
|
||||
core/wdba2.test \
|
||||
core/babiak.test \
|
||||
core/monitor.test \
|
||||
core/dra2dba.test \
|
||||
core/unambig.test \
|
||||
core/ltlcross4.test \
|
||||
core/ltl3dra.test \
|
||||
core/ltl2dstar.test \
|
||||
core/ltl2dstar2.test \
|
||||
core/ltl2dstar3.test \
|
||||
core/ltl2dstar4.test \
|
||||
core/ltl2ta.test \
|
||||
core/ltl2ta2.test \
|
||||
core/randaut.test \
|
||||
core/randtgba.test \
|
||||
core/isomorph.test \
|
||||
core/uniq.test \
|
||||
core/sbacc.test \
|
||||
core/stutter-tgba.test \
|
||||
core/strength.test \
|
||||
core/emptchk.test \
|
||||
core/emptchke.test \
|
||||
core/dfs.test \
|
||||
core/ltlcrossce.test \
|
||||
core/ltlcrossce2.test \
|
||||
core/emptchkr.test \
|
||||
core/ltlcounter.test \
|
||||
core/basimul.test \
|
||||
core/satmin.test \
|
||||
core/satmin2.test \
|
||||
core/spotlbtt.test \
|
||||
core/ltlcross.test \
|
||||
core/spotlbtt2.test \
|
||||
core/ltlcross2.test \
|
||||
core/complementation.test \
|
||||
core/randpsl.test \
|
||||
core/cycles.test
|
||||
|
||||
distclean-local:
|
||||
rm -rf $(TESTS:.test=.dir)
|
||||
|
||||
TESTS_python = \
|
||||
python/acc_cond.ipynb \
|
||||
python/accparse.ipynb \
|
||||
python/accparse2.py \
|
||||
python/alarm.py \
|
||||
python/automata.ipynb \
|
||||
python/automata-io.ipynb \
|
||||
python/bddnqueen.py \
|
||||
python/decompose.ipynb \
|
||||
python/formulas.ipynb \
|
||||
python/implies.py \
|
||||
python/interdep.py \
|
||||
python/ltl2tgba.test \
|
||||
python/ltlparse.py \
|
||||
python/ltlsimple.py \
|
||||
python/minato.py \
|
||||
python/optionmap.py \
|
||||
python/parsetgba.py \
|
||||
python/piperead.ipynb \
|
||||
python/product.ipynb \
|
||||
python/randaut.ipynb \
|
||||
python/randgen.py \
|
||||
python/randltl.ipynb \
|
||||
python/relabel.py \
|
||||
python/remfin.py \
|
||||
python/satmin.py \
|
||||
python/setxor.py \
|
||||
python/testingaut.ipynb
|
||||
|
||||
SUFFIXES = .ipynb .html
|
||||
.ipynb.html:
|
||||
$(IPYTHON) nbconvert $< --to html --stdout >$@
|
||||
|
||||
.PHONY: nb-html
|
||||
nb-html: $(TESTS_python:.ipynb=.html)
|
||||
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(TESTS) \
|
||||
python/ltl2tgba.py \
|
||||
python/ipnbdoctest.py
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue