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

Allow lbtt not to be built, and skip relevant tests.

Browse source 
* m4/lbtt.m4: Turn the missing lbtt error into a warning,
and do not configure lbtt wen --without-included-lbtt is specified.
* bench/ltl2tgba/defs.in: Abort if lbtt is missing.
* src/tgbatest/defs.in (need_lbtt): New function to skip
tests that require lbtt.
* src/tgbatest/babiak.test, src/tgbatest/ltl2neverclaim.test,
src/tgbatest/spotlbtt.test: Call need_lbtt.
This commit is contained in:
Alexandre Duret-Lutz 2012-04-27 11:09:13 +02:00
parent b5b3cd9d0c
commit b23296cf61
6 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tgbatest/babiak.test
View file

@ -1,5 +1,6 @@
#!/bin/sh
# Copyright (C) 2011 Laboratoire de Recherche et Développement
# -*- coding: utf-8 -*-
# Copyright (C) 2011, 2012 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -28,6 +29,7 @@
# buildfarm will timeout if it does).
. ./defs
need_lbtt
set -e
@ -110,6 +112,3 @@ EOF
${LBTT} --formulafile=formulae
rm config

19
src/tgbatest/defs.in
View file

@ -1,8 +1,8 @@
# -*- shell-script -*-
# Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
# -*- mode: shell-script; coding: utf-8 -*-
# Copyright (C) 2009, 2010, 2012 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
# Copyright (C) 2003, 2004, 2006 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
# et Marie Curie.
#
# This file is part of Spot, a model checking library.
@ -51,11 +51,10 @@ rm -rf $testSubDir > /dev/null 2>&1
mkdir $testSubDir
cd $testSubDir
# Adjust srcdir now that we are in a subdirectory. We still want to
# source directory corresponding to the build directory that contains
# $testSubDir.
# Adjust srcdir now that we are in a subdirectory. We still want
# $srcdir to point to the source directory corresponding to the build
# directory that contains $testSubDir.
case $srcdir in
# I
[\\/$]* | ?:[\\/]* );;
*) srcdir=../$srcdir
esac
@ -68,6 +67,12 @@ VALGRIND='@VALGRIND@'
SPIN='@SPIN@'
LTL2BA='@LTL2BA@'
need_lbtt()
{
# LBTT may not have been installed or compiled.
("$LBTT" --version) || exit 77
}
run()
{
expected_exitcode=$1

6
src/tgbatest/ltl2neverclaim.test
View file

@ -1,5 +1,6 @@
#!/bin/sh
# Copyright (C) 2010 Laboratoire de Recherche et Développement
# -*- coding: utf-8 -*-
# Copyright (C) 2010, 2012 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -19,7 +20,7 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# Do some quick translations to make sure the neverclaim produced by
# Do some quick translations to make sure the neverclaims produced by
# spot actually look correct!
# This test is separate from spotlbtt.test, because lbtt-translate
@ -27,6 +28,7 @@
# Spin.
. ./defs
need_lbtt
set -e

1
src/tgbatest/spotlbtt.test
View file

@ -27,6 +27,7 @@
echo 'This test can take as long as 15 minutes on a 2GHz Pentium 4.'
. ./defs
need_lbtt
set -e