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

move the sanity tests in tests/sanity/

Browse source 
* spot/sanity/: Move ...
* tests/sanity/: ... here.
* spot/sanity/Makefile.am: Merge with...
* tests/Makefile.am: ... this.
* tests/run.in: Learn to run perl tests.
* README, configure.ac, spot/Makefile.am: Adjust.
* spot/tl/mark.hh: Add missing SPOT_API detected by
fixed private.test.

* spot/twaalgos/weight.cc, spot/twaalgos/weight.hh: Move...
* spot/priv/weight.cc, spot/priv/weight.hh: ... here, as
suggested by fixed private.test.
* spot/twaalgos/tau03opt.cc, spot/twaalgos/Makefile.am,
spot/priv/Makefile.am: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2016-01-05 11:39:01 +01:00
parent 6b881a2e38
commit 6e854b6d83
19 changed files with 79 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -148,13 +148,13 @@ spot/ Sources for libspot.
twa/ TωA objects and cousins (Transition-based ω-Automata).
twaalgos/ Algorithms on TωA.
gtec/ Couvreur's Emptiness-Check.
sanity/ Sanity tests for the whole project.
bin/ Command-line tools built on top of libspot.
man/ Man pages for the above tools.
tests/ Test suite.
core/ Tests for libspot and the binaries.
ltsmin/ Tests for the DiVinE2/SpinS interface.
python/ Tests for Python bindings.
sanity/ Tests for the coherence of the source base.
doc/ Documentation for Spot.
org/ Source of userdoc/ as org-mode files.
tl/ Documentation of the Temporal Logic operators.

5
configure.ac
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Laboratoire
# de Recherche et Développement de l'Epita (LRDE).
# Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
# Laboratoire de Recherche et Développement de l'Epita (LRDE).
# Copyright (C) 2003, 2004, 2005, 2006, 2007 Laboratoire
# d'Informatique de Paris 6 (LIP6), département Systèmes Répartis
# Coopératifs (SRC), Université Pierre et Marie Curie.
@ -209,7 +209,6 @@ AC_CONFIG_FILES([
spot/parseaut/Makefile
spot/parsetl/Makefile
spot/priv/Makefile
spot/sanity/Makefile
spot/taalgos/Makefile
spot/ta/Makefile
spot/tl/Makefile

6
spot/Makefile.am
View file

@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
## Copyright (C) 2009, 2010, 2012, 2013, 2014, 2015 Laboratoire de Recherche
## et Développement de l'Epita (LRDE).
## Copyright (C) 2009, 2010, 2012, 2013, 2014, 2015, 2016 Laboratoire
## de Recherche et Développement de l'Epita (LRDE).
## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
## département Systèmes Répartis Coopératifs (SRC), Université Pierre
## et Marie Curie.
@ -26,7 +26,7 @@ AUTOMAKE_OPTIONS = subdir-objects
# end, after building '.' (since the current directory contains
# libspot.la needed by the tests)
SUBDIRS = misc priv tl graph twa twaalgos ta taalgos kripke \
parseaut parsetl . ltsmin sanity
parseaut parsetl . ltsmin
lib_LTLIBRARIES = libspot.la
libspot_la_SOURCES =

16
spot/priv/Makefile.am
View file

@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
## Copyright (C) 2013, 2014, 2015 Laboratoire de Recherche et
## Copyright (C) 2013, 2014, 2015, 2016 Laboratoire de Recherche et
## Développement de l'Epita (LRDE).
##
## This file is part of Spot, a model checking library.
@ -20,14 +20,14 @@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
noinst_HEADERS = \
accmap.hh \
bddalloc.hh \
freelist.hh \
trim.hh
noinst_LTLIBRARIES = libpriv.la
libpriv_la_SOURCES = \
accmap.hh \
bddalloc.cc \
bddalloc.hh \
freelist.cc \
trim.cc
freelist.hh \
trim.cc \
trim.hh \
weight.cc \
weight.hh

6
spot/twaalgos/weight.cc → spot/priv/weight.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2014 Laboratoire de Recherche et Developpement
// de l'Epita.
// Copyright (C) 2011, 2014, 2016 Laboratoire de Recherche et
// Developpement de l'Epita.
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
@ -22,7 +22,7 @@
#include <cassert>
#include <ostream>
#include <spot/twaalgos/weight.hh>
#include <spot/priv/weight.hh>
namespace spot
{

0
spot/twaalgos/weight.hh → spot/priv/weight.hh
View file

79
spot/sanity/Makefile.am
View file

@ -1,79 +0,0 @@
## -*- coding: utf-8 -*-
## Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015 Laboratoire de
## Recherche et Développement de l'Epita (LRDE).
## Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
## département Systèmes Répartis Coopératifs (SRC), Université Pierre
## et Marie Curie.
##
## This file is part of Spot, a model checking library.
##
## Spot is free software; you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 3 of the License, or
## (at your option) any later version.
##
## Spot is distributed in the hope that it will be useful, but WITHOUT
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
## License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
# Run `make TESTHEADER=foo.hh check' if you want to check only one
# header.
check-80columns:
INCDIR='$(top_srcdir)/spot' \
$(SHELL) $(srcdir)/80columns.test $(TESTHEADER)
check-style:
INCDIR='$(top_srcdir)/spot' \
$(SHELL) $(srcdir)/style.test $(TESTHEADER)
check-readme:
top_srcdir='$(top_srcdir)' \
$(PERL) $(srcdir)/readme.test
check-ipynb:
top_srcdir='$(top_srcdir)' \
$(PERL) $(srcdir)/ipynb.test
check-includes:
CXX='$(CXX)' \
CPPFLAGS='$(AM_CPPFLAGS) $(CPPFLAGS) $(DEFS)' \
CXXFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' \
INCDIR='$(top_srcdir)/spot' \
TOPBUILD='$(top_builddir)' \
$(SHELL) $(srcdir)/includes.test $(TESTHEADER)
.PHONY: check-80columns check-style check-readme check-includes check-ipynb
check-local: check-80columns check-style check-readme check-includes check-ipynb
# Ensure we have not forgotten to include an header.
check-installed-includes:
CXX='$(CXX)' \
CPPFLAGS='-I $(includedir) -I$(pkgincludedir) $(CPPFLAGS)' \
CXXFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' \
INCDIR='$(pkgincludedir)' \
$(SHELL) $(srcdir)/includes.test $(TESTHEADER)
# Any installed header should contain a SPOT_API tag somewhere.
check-installed-private:
INCDIR='$(pkgincludedir)' \
SRCDIR='$(top_srcdir)/src' \
$(SHELL) $(srcdir)/private.test $(TESTHEADER)
installcheck-local: check-installed-includes check-installed-private
CLEANFILES = failures incltest.*
EXTRA_DIST = \
80columns.test \
includes.test \
ipynb.test \
private.test \
readme.test \
style.test

6
spot/tl/mark.hh
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2010, 2011, 2012, 2013, 2015 Laboratoire de Recherche
// et Développement de l'Epita (LRDE).
// Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016 Laboratoire de
// Recherche et Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -24,7 +24,7 @@
namespace spot
{
class mark_tools final
class SPOT_API mark_tools final
{
public:
/// \ingroup tl_rewriting

4
spot/twaalgos/Makefile.am
View file

@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
## Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Laboratoire
## Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Laboratoire
## de Recherche et Développement de l'Epita (LRDE).
## Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris
## 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
@ -134,8 +134,6 @@ libtwaalgos_la_SOURCES = \
tau03opt.cc \
totgba.cc \
translate.cc \
weight.cc \
weight.hh \
word.cc
libtwaalgos_la_LIBADD = gtec/libgtec.la

4
spot/twaalgos/tau03opt.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2013, 2014, 2015 Laboratoire de Recherche et
// Copyright (C) 2011, 2013, 2014, 2015, 2016 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
@ -49,7 +49,7 @@
#include <spot/twaalgos/emptiness.hh>
#include <spot/twaalgos/emptiness_stats.hh>
#include <spot/twaalgos/tau03opt.hh>
#include <spot/twaalgos/weight.hh>
#include <spot/priv/weight.hh>
#include <spot/twaalgos/ndfs_result.hxx>
namespace spot

17
tests/Makefile.am
View file

@ -26,7 +26,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
LDADD = $(top_builddir)/spot/libspot.la
TEST_EXTENTIONS = .test .py .ipynb
TEST_EXTENTIONS = .test .py .ipynb .pl
LOG_COMPILER = ./run
TEST_LOG_COMPILER = ./run
@ -36,8 +36,8 @@ check_SCRIPTS = run
# We try to keep this somehow by strength. Test basic things first,
# because such failures will be easier to diagnose and fix.
TESTS = $(TESTS_tl) $(TESTS_graph) $(TESTS_kripke) $(TESTS_twa) \
$(TESTS_python) $(TESTS_ltsmin)
TESTS = $(TESTS_sanity) $(TESTS_tl) $(TESTS_graph) $(TESTS_kripke) \
$(TESTS_twa) $(TESTS_python) $(TESTS_ltsmin)
distclean-local:
rm -rf $(TESTS:.test=.dir)
@ -334,3 +334,14 @@ TESTS_ltsmin = \
EXTRA_DIST += ltsmin/beem-peterson.4.dve ltsmin/finite.dve ltsmin/finite.pm
ltlsmin/kripke.log: core/parse_print$(EXEEXT)
############################## SANITY ##############################
TESTS_sanity = \
sanity/80columns.test \
sanity/includes.test \
sanity/ipynb.pl \
sanity/private.test \
sanity/readme.pl \
sanity/style.test

4
tests/run.in
View file

@ -1,6 +1,6 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2010, 2011, 2014, 2015 Laboratoire de Recherche et
# Copyright (C) 2010, 2011, 2014, 2015, 2016 Laboratoire de Recherche et
# Developpement de l'EPITA (LRDE).
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6
# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
@ -77,6 +77,8 @@ case $1 in
exec $PREFIXCMD @PYTHON@ "$@";;
*.test)
exec sh -x "$@";;
*.pl)
exec @PERL@ "$@";;
*python*)
PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath \
exec $PREFIXCMD "$@";;

0
spot/sanity/.gitignore → tests/sanity/.gitignore vendored
View file

3
spot/sanity/80columns.test → tests/sanity/80columns.test
View file

@ -42,11 +42,12 @@ fi
x="$x$x$x$x$x$x$x$x$x" # 9x
x="$x$x$x$x$x$x$x$x$x" # 81x
for dir in "${INCDIR-..}"; do
for dir in "${srcdir-.}/../../spot" "${srcdir-.}/.."; do
find "$dir" \( -name "${1-*}.hh" \
-o -name "${1-*}.hxx" \
-o -name "${1-*}.cc" \
-o -name "${1-*}.py" \
-o -name "${1-*}.test" \) -a -type f -a -print |
while read file; do
if (expand $file | grep -q $x) 2>/dev/null; then

6
spot/sanity/includes.test → tests/sanity/includes.test
View file

@ -1,6 +1,6 @@
#! /bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2008, 2011, 2012 Laboratoire de Recherche et
# Copyright (C) 2008, 2011, 2012, 2016 Laboratoire de Recherche et
# Développement de l'Epita (LRDE).
# Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6
# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
@ -27,8 +27,8 @@ set -e
rm -f failures
# Remove any trailing slash
INCDIR=${INCDIR%/}
INCDIR=${srcdir-.}/../../spot
for file in `find "$INCDIR" \( -name "${1-*}.hh" \
-o -name "${1-*}.hxx" \) \

13
spot/sanity/ipynb.test → tests/sanity/ipynb.pl
View file

@ -1,7 +1,7 @@
#! /usr/bin/perl -w
# -*- cperl; coding: utf-8 -*-
#
# Copyright (C) 2010, 2015 Laboratoire de Recherche et Développement
# Copyright (C) 2015, 2016 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -29,11 +29,10 @@ use strict;
use warnings;
local $\ = "\n";
my $top_srcdir = $ENV{top_srcdir} || "../../";
my $top_srcdir_len = length($top_srcdir) + 1;
my $srcdir = $ENV{srcdir} || ".";
my $tut = "$top_srcdir/doc/org/tut.org";
my $dir = "$top_srcdir/tests/python";
my $tut = "$srcdir/../../doc/org/tut.org";
my $dir = "$srcdir/../../tests/python";
unless (-f $tut)
{
print STDERR "$tut not found";
@ -51,7 +50,7 @@ while (<FD>)
$seen{$1} = 1;
unless (-f "$dir/$1")
{
print STDERR "notebook mentioned in tut.org does not exist";
print STDERR "notebook $1 mentioned in tut.org does not exist";
$exit_status = 1;
}
}
@ -73,4 +72,6 @@ while (<FD>)
}
close(FD);
die "No notebook found?" if scalar(keys %seen) == 0;
exit $exit_status;

28
spot/sanity/private.test → tests/sanity/private.test
View file

@ -1,6 +1,6 @@
#! /bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2013 Laboratoire de Recherche et
# Copyright (C) 2013, 2016 Laboratoire de Recherche et
# Développement de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -27,25 +27,29 @@ set -e
rm -f failures
# Remove any trailing slash
INCDIR=${INCDIR%/}
INCDIR=${srcdir-.}/../../spot
for file in `find "$INCDIR" \( -name "${1-*}.hh" \
-o -name "${1-*}.hxx" \) \
-o -name "${1-*}.hxx" \) \
-a -type f -a -print | sed "s,$INCDIR/,,g"`; do
if grep SPOT_API "$INCDIR/$file" >/dev/null; then
:
elif test -f "$SRCDIR/${file%.*}.cc"; then
echo "FAIL: $file -- no exported symbol, should this file be private?"
echo " $file" >> failures
fi
case $file in
priv/*) ;;
*)
if grep -E -q '(SPOT_API|GNU Bison)' "$INCDIR/$file"; then
:
elif test -f "$INCDIR/${file%.*}.cc"; then
echo "FAIL: $file -- no exported symbol, should this file be private?"
echo " $file" >> failures
fi
;;
esac
done
if test -f failures; then
echo "Failed files:"
cat failures
rm failures
exit 1;
exit 1
fi

7
spot/sanity/readme.test → tests/sanity/readme.pl
View file

@ -1,8 +1,8 @@
#! /usr/bin/perl -w
# -*- cperl; coding: utf-8 -*-
#
# Copyright (C) 2010, 2015 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
# Copyright (C) 2010, 2015, 2016 Laboratoire de Recherche et
# Développement de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
#
@ -29,7 +29,8 @@ use strict;
use warnings;
local $\ = "\n";
my $top_srcdir = $ENV{top_srcdir} || "../../";
my $srcdir = $ENV{srcdir} || ".";
my $top_srcdir = "$srcdir/../..";
my $top_srcdir_len = length($top_srcdir) + 1;
my $list_mode = ($#ARGV != -1 && $ARGV[0] eq "--list");

12
spot/sanity/style.test → tests/sanity/style.test
View file

@ -1,7 +1,7 @@
#! /bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Laboratoire de
# Recherche et Développement de l'Epita (LRDE).
# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
# Laboratoire de Recherche et Développement de l'Epita (LRDE).
# Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6
# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
# Pierre et Marie Curie.
@ -44,18 +44,20 @@ if (grep --color=auto -n --version)>/dev/null 2>&1; then
fi
# Reset the locale, so for instance we don't get bugs because sed is
# expecting utf-8 and we feed him latin-1. The C locale should be OK,
# expecting utf-8 and we feed it latin-1. The C locale should be OK,
# because we do not treat extended characters specifically in the
# following style rules.
LC_ALL=C
export LC_ALL
tmp=incltest.tmp
mkdir -p style.dir
tmp=style.dir/incltest.tmp.$$
# We used to loop over more directories before the source tree was
# rearranged. So there is only one left today, but we keep the loop
# in case we want to add more in the future.
for dir in "${INCDIR-..}" "${INCDIR-..}/../bin" "${INCDIR-..}/../tests"; do
TOP=${srcdir-.}/../..
for dir in "$TOP/spot" "$TOP/bin" "$TOP/tests"; do
find "$dir" \( -name "${1-*}.hh" \
-o -name "${1-*}.hxx" \