Use Automake 1.11's parallel-tests feature.
* configure.ac: Enable parallel-tests. * src/eltltest/defs.in, src/evtgbatest/defs.in, src/ltltest/defs.in, src/tgbatest/defs.in: Always output verbose tests. Make a subdirectory for each test case. * src/ltltest/Makefile.am, src/eltltest/Makefile.am, src/tgbatest/Makefile.am, src/evtgbatest/Makefile.am: Remove CLEANFILES and clean the test subdirectories in a distclean-local rule instead. * src/eltltest/acc.test, src/eltltest/nfa.test, src/evtgbatest/explicit.test, src/evtgbatest/ltl2evtgba.test, src/evtgbatest/product.test, src/evtgbatest/readsave.test, src/ltltest/equals.test, src/ltltest/lunabbrev.test, src/ltltest/nenoform.test, src/ltltest/parse.test, src/ltltest/parseerr.test, src/ltltest/reduc.test, src/ltltest/reduccmp.test, src/ltltest/syntimpl.test, src/ltltest/tostring.test, src/ltltest/tunabbrev.test, src/ltltest/tunenoform.test, src/tgbatest/bddprod.test, src/tgbatest/complementation.test, src/tgbatest/dfs.test, src/tgbatest/dupexp.test, src/tgbatest/eltl2tgba.test, src/tgbatest/emptchk.test, src/tgbatest/emptchke.test, src/tgbatest/emptchkr.test, src/tgbatest/explicit.test, src/tgbatest/explpro2.test, src/tgbatest/explpro3.test, src/tgbatest/explpro4.test, src/tgbatest/explprod.test, src/tgbatest/ltl2neverclaim.test, src/tgbatest/ltl2tgba.test, src/tgbatest/ltlprod.test, src/tgbatest/mixprod.test, src/tgbatest/readsave.test, src/tgbatest/reduccmp.test, src/tgbatest/reductgba.test, src/tgbatest/scc.test, src/tgbatest/spotlbtt.test, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.test: Adjust to run from a subdirectory.
This commit is contained in:
parent
1f7aa90d74
commit
1098c62de2
51 changed files with 488 additions and 467 deletions
|
|
@ -46,4 +46,6 @@ TESTS = \
|
|||
ltl2evtgba.test
|
||||
|
||||
EXTRA_DIST = $(TESTS)
|
||||
CLEANFILES = input1 input2 input3 stdout expected
|
||||
|
||||
distclean-local:
|
||||
rm -rf $(TESTS:.test=.dir)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# -*- shell-script -*-
|
||||
# Copyright (C) 2003, 2004, 2006 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# Copyright (C) 2003, 2004, 2006, 2009 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
|
|
@ -26,9 +26,8 @@ test -f ./defs || {
|
|||
exit 1
|
||||
}
|
||||
|
||||
# If srcdir is not set, then we are not running from `make check', be verbose.
|
||||
# If srcdir is not set, then we are not running from `make check'.
|
||||
if test -z "$srcdir"; then
|
||||
test -z "$VERBOSE" && VERBOSE=x
|
||||
# compute $srcdir.
|
||||
srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'`
|
||||
test $srcdir = $0 && srcdir=.
|
||||
|
|
@ -40,11 +39,16 @@ test -f $srcdir/defs.in || {
|
|||
exit 1
|
||||
}
|
||||
|
||||
# User can set VERBOSE to see all output.
|
||||
test -z "$VERBOSE" && exec >/dev/null 2>&1
|
||||
|
||||
echo "== Running test $0"
|
||||
|
||||
me=`echo "$0" | sed -e 's,.*[\\/],,;s/\.test$//'`
|
||||
|
||||
testSubDir=$me.dir
|
||||
chmod -R a+rwx $testSubDir > /dev/null 2>&1
|
||||
rm -rf $testSubDir > /dev/null 2>&1
|
||||
mkdir $testSubDir
|
||||
cd $testSubDir
|
||||
|
||||
DOT='@DOT@'
|
||||
top_builddir='@top_builddir@'
|
||||
LBTT="@LBTT@"
|
||||
|
|
@ -71,9 +75,4 @@ run()
|
|||
test $exitcode = $expected_exitcode || exit 1
|
||||
}
|
||||
|
||||
# Turn on shell traces when VERBOSE=x.
|
||||
if test "x$VERBOSE" = xx; then
|
||||
set -x
|
||||
else
|
||||
:
|
||||
fi
|
||||
set -x
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
# Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# Copyright (C) 2004, 2005, 2009 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
set -e
|
||||
|
||||
run 0 ./explicit > stdout
|
||||
run 0 ../explicit > stdout
|
||||
|
||||
cat >expected <<\EOF
|
||||
digraph G {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# Copyright (C) 2003, 2004, 2009 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
|
|
@ -27,8 +27,8 @@ set -e
|
|||
|
||||
check ()
|
||||
{
|
||||
run 0 ./ltl2evtgba "$1"
|
||||
run 0 ./ltl2evtgba -Uun1,un2,un3 "$1"
|
||||
run 0 ../ltl2evtgba "$1"
|
||||
run 0 ../ltl2evtgba -Uun1,un2,un3 "$1"
|
||||
}
|
||||
|
||||
# We don't check the output, but just running these might be enough to
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
# Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# Copyright (C) 2004, 2009 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systčmes Répartis Coopératifs (SRC), Université Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
|
|
@ -47,7 +47,7 @@ u1, u2, c, Acc1;
|
|||
u2, u1, b, Acc2;
|
||||
EOF
|
||||
|
||||
run 0 ./product input1 input2 input3 >stdout
|
||||
run 0 ../product input1 input2 input3 >stdout
|
||||
|
||||
cat >expected <<\EOF
|
||||
acc = Acc1 Acc2 Acc3;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
# Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# Copyright (C) 2004, 2009 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
|
|
@ -33,7 +33,7 @@ s1, "s2", e1, c;
|
|||
"state 3", "s1",e4,;
|
||||
EOF
|
||||
|
||||
./readsave input > stdout
|
||||
../readsave input > stdout
|
||||
|
||||
cat >expected <<\EOF
|
||||
acc = c d;
|
||||
|
|
@ -46,7 +46,7 @@ EOF
|
|||
diff stdout expected
|
||||
|
||||
mv stdout input
|
||||
run 0 ./readsave input > stdout
|
||||
run 0 ../readsave input > stdout
|
||||
|
||||
diff input stdout
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue