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

Fix ltlcounter.test for VPATH builds and n > 2.

Browse source 
* src/tgbatest/defs.in (srcdir): Adjust from VPATH builds.
* src/tgbatest/ltlcounter.test (lcdir): Adjust definition to
new value of $srcdir.
(run): Fix setting of $run after $n = 2.  Using run=: would in
fact disable all the big tests...
This commit is contained in:
Alexandre Duret-Lutz 2009-11-05 21:22:12 +01:00
parent b57fdcb684
commit eab1261437
3 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2009-11-05 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Fix ltlcounter.test for VPATH builds and n > 2.
* src/tgbatest/defs.in (srcdir): Adjust from VPATH builds.
* src/tgbatest/ltlcounter.test (lcdir): Adjust definition to
new value of $srcdir.
(run): Fix setting of $run after $n = 2. Using run=: would in
fact disable all the big tests...
2009-11-05 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2009-11-05 Alexandre Duret-Lutz <adl@lrde.epita.fr>
* src/tgbatest/ltlcounter.test (run): Only construct small * src/tgbatest/ltlcounter.test (run): Only construct small

9
src/tgbatest/defs.in
View file

@ -49,6 +49,15 @@ rm -rf $testSubDir > /dev/null 2>&1
mkdir $testSubDir mkdir $testSubDir
cd $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.
case $srcdir in
# I
[\\/$]* | ?:[\\/]* );;
*) srcdir=../$srcdir
esac
DOT='@DOT@' DOT='@DOT@'
top_builddir='../@top_builddir@' top_builddir='../@top_builddir@'
LBTT="@LBTT@" LBTT="@LBTT@"

18
src/tgbatest/ltlcounter.test
View file

@ -25,7 +25,7 @@
set -e set -e
lcdir=$srcdir/../ltlcounter lcdir=$srcdir/ltlcounter
lc=$lcdir/LTLcounter.pl lc=$lcdir/LTLcounter.pl
lcl=$lcdir/LTLcounterLinear.pl lcl=$lcdir/LTLcounterLinear.pl
lcc=$lcdir/LTLcounterCarry.pl lcc=$lcdir/LTLcounterCarry.pl
@ -50,21 +50,21 @@ check_formula()
# so the translation of the formula stopped midway, on a formula it # so the translation of the formula stopped midway, on a formula it
# thought it had already seen. # thought it had already seen.
for i in 1 2 3 4 5 6 7 8 9 10 11 12 for n in 1 2 3 4 5 6 7 8 9 10 11 12
do do
:;:;: "========== $i counters ==========" ;:;: # only visible with "set -x" :;:;: "========== $n counters ==========" ;:;: # only visible with "set -x"
f=`"$lc" $i` f=`"$lc" $n`
check_formula "$f" check_formula "$f"
f=`"$lcl" $i` f=`"$lcl" $n`
check_formula "$f" check_formula "$f"
f=`"$lcc" $i` f=`"$lcc" $n`
check_formula "$f" check_formula "$f"
f=`"$lccl" $i` f=`"$lccl" $n`
check_formula "$f" check_formula "$f"
# Only run the first two formulae under valgrind, # Only run the first two formulae under valgrind,
# it is too slow otherwise. # it is too slow otherwise.
if test $i = 2; then if test $n = 2; then
run=: run=
fi fi
done done