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

Merge the core and python tests in the tests/ directory

Browse source 
* 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 2015-12-30 09:50:52 +01:00
parent 18572db39f
commit 5cb94a1a3f
197 changed files with 734 additions and 715 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spot/ltsmin/Makefile.am
View file

@ -42,11 +42,11 @@ check_SCRIPTS = defs
TESTS = check.test finite.test finite2.test kripke.test
EXTRA_DIST = $(TESTS) beem-peterson.4.dve finite.dve finite.pm
kripke.test: $(top_builddir)/tests/parse_print$(EXEEXT)
kripke.test: $(top_builddir)/tests/core/parse_print$(EXEEXT)
$(top_builddir)/tests/parse_print$(EXEEXT):
$(top_builddir)/tests/core/parse_print$(EXEEXT):
cd $(top_builddir)/tests && \
$(MAKE) $(AM_MAKEFLAGS) parse_print$(EXEEXT)
$(MAKE) $(AM_MAKEFLAGS) core/parse_print$(EXEEXT)
distclean-local:
rm -rf $(TESTS:.test=.dir)

4
spot/ltsmin/kripke.test
View file

@ -34,9 +34,9 @@ fi
set -e
run 0 ../modelcheck -gK $srcdir/finite.dve 'F("P.a > 5")' > output
run 0 $top_builddir/tests/parse_print output | tr -d '"' > output2
run 0 $top_builddir/tests/core/parse_print output | tr -d '"' > output2
tr -d '"' < output >outputF
cmp outputF output2
../modelcheck -gK $srcdir/beem-peterson.4.dve '!G("pos[1] < 3")' > outputP
$top_builddir/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")'
$top_builddir/tests/core/ikwiad -e -KPoutputP '!G("pos[1] < 3")'

6
spot/sanity/ipynb.test
View file

@ -33,7 +33,7 @@ my $top_srcdir = $ENV{top_srcdir} || "../../";
my $top_srcdir_len = length($top_srcdir) + 1;
my $tut = "$top_srcdir/doc/org/tut.org";
my $dir = "$top_srcdir/python/tests";
my $dir = "$top_srcdir/tests/python";
unless (-f $tut)
{
print STDERR "$tut not found";
@ -58,10 +58,10 @@ while (<FD>)
}
close(FD);
open(FD, "$dir/Makefile.am") or die $!;
open(FD, "$dir/../Makefile.am") or die "$!";
while (<FD>)
{
if (m:\s([\w-]+\.ipynb):)
if (m:python/([\w-]+\.ipynb):)
{
# print "$1 exist";
unless (exists $seen{$1})