tgbatest: Rewrite ltl2neverclaim using ltlcross.

* src/tgbatest/ltl2neverclaim.test: Rename as...
* src/tgbatest/ltl2neverclaim-lbtt.test: ... this.
* src/tgbatest/ltl2neverclaim.test: New version, using ltlcross.
* src/tgbatest/Makefile.am: Add ltl2neverclaim-lbtt.test.

src/tgbatest/Makefile.am

@@ -1,4 +1,4 @@
-## Copyright (C) 2009, 2010, 2011, 2012 Laboratoire de Recherche et
+## Copyright (C) 2009, 2010, 2011, 2012, 2013 Laboratoire de Recherche et
 ## Développement de l'Epita (LRDE).
 ## Copyright (C) 2003, 2004, 2005, 2006 Laboratoire d'Informatique de
 ## Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
@@ -81,6 +81,7 @@ TESTS = \
   readsave.test \
   ltl2tgba.test \
   ltl2neverclaim.test \
+  ltl2neverclaim-lbtt.test \
   ltl2ta.test \
   ltlprod.test \
   bddprod.test \

src/tgbatest/ltl2neverclaim-lbtt.test

@@ -0,0 +1,103 @@
+#!/bin/sh
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2012, 2013 Laboratoire de Recherche et
+# Développement de l'Epita (LRDE).
+#
+# 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/>.
+
+# 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
+# will refuse to pass M and W to a tool (spot) that masquerades as
+# Spin.
+
+. ./defs
+need_lbtt
+
+set -e
+
+cat > config <<EOF
+Algorithm
+{
+   Name = "Spot (Couvreur -- FM)"
+   Path = "${LBTT_TRANSLATE}"
+   Parameters = "--spot '../ltl2tgba -F -f -t'"
+   Enabled = yes
+}
+
+Algorithm
+{
+   Name = "Spot (Couvreur -- FM), with reductions"
+   Path = "${LBTT_TRANSLATE}"
+   Parameters = "--spot '../ltl2tgba -r4 -R3f -F -f -t'"
+   Enabled = no
+}
+
+Algorithm
+{
+   Name = "Spot (Couvreur -- FM), degeneralized via never claim"
+   Path = "${LBTT_TRANSLATE}"
+   Parameters = "--spin '../ltl2tgba -F -f -N'"
+   Enabled = yes
+}
+
+Algorithm
+{
+   Name = "Spot (Couvreur -- FM), reductions, degeneralized via never claim"
+   Path = "${LBTT_TRANSLATE}"
+   Parameters = "--spin '../ltl2tgba -F -f -r4 -R3 -N'"
+   Enabled = yes
+}
+
+GlobalOptions
+{
+   Rounds = 100
+   Interactive = Never
+#   Verbosity = 5
+#   ComparisonCheck = no
+#   ConsistencyCheck = no
+#   IntersectionCheck = no
+}
+
+FormulaOptions
+{
+  Size = 1...13
+  Propositions = 6
+
+  AbbreviatedOperators = Yes
+  GenerateMode = Normal
+  OutputMode = Normal
+  PropositionPriority = 50
+
+  TruePriority = 1
+  FalsePriority = 1
+
+  AndPriority = 10
+  OrPriority = 10
+  XorPriority = 0
+  # EquivalencePriority = 0
+
+  BeforePriority = 0
+  StrongReleasePriority = 0
+  WeakUntilPriority = 0
+
+  DefaultOperatorPriority = 5
+}
+EOF
+
+${LBTT}
+rm config

src/tgbatest/ltl2neverclaim.test

@@ -1,7 +1,7 @@
 #!/bin/sh
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2012 Laboratoire de Recherche et Développement
+# Copyright (C) 2010, 2012, 2013 Laboratoire de Recherche et
-# de l'Epita (LRDE).
+# Développement de l'Epita (LRDE).
 #
 # This file is part of Spot, a model checking library.
 #
@@ -19,85 +19,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Do some quick translations to make sure the neverclaims produced by
-# spot actually look correct!
+# spot actually look correct!  We do that by parsing them via ltlcross.
-
+# ltl2neverclaim-lbtt.test does the same with LBTT if it is installed.
-# This test is separate from spotlbtt.test, because lbtt-translate
-# will refuse to passe M and W to a tool (spot) that masquerades as
-# Spin.
 
 . ./defs
-need_lbtt
-
 set -e
 
-cat > config <<EOF
+ltl2tgba=../ltl2tgba
-Algorithm
-{
-   Name = "Spot (Couvreur -- FM)"
-   Path = "${LBTT_TRANSLATE}"
-   Parameters = "--spot '../ltl2tgba -F -f -t'"
-   Enabled = yes
-}
 
-Algorithm
+../../bin/randltl -n 100 p1 p2 p3 p4 p5 p6 --tree-size 5..15 |
-{
+../../bin/ltlcross \
-   Name = "Spot (Couvreur -- FM), with reductions"
+  "$ltl2tgba -t %f > %T" \
-   Path = "${LBTT_TRANSLATE}"
+  "$ltl2tgba -t -r4 -R3f %f > %T" \
-   Parameters = "--spot '../ltl2tgba -r4 -R3f -F -f -t'"
+  "$ltl2tgba -N %f > %N" \
-   Enabled = no
+  "$ltl2tgba -N -r4 -R3f %f > %N"
-}
-
-Algorithm
-{
-   Name = "Spot (Couvreur -- FM), degeneralized via never claim"
-   Path = "${LBTT_TRANSLATE}"
-   Parameters = "--spin '../ltl2tgba -F -f -N'"
-   Enabled = yes
-}
-
-Algorithm
-{
-   Name = "Spot (Couvreur -- FM), reductions, degeneralized via never claim"
-   Path = "${LBTT_TRANSLATE}"
-   Parameters = "--spin '../ltl2tgba -F -f -r4 -R3 -N'"
-   Enabled = yes
-}
-
-GlobalOptions
-{
-   Rounds = 100
-   Interactive = Never
-#   Verbosity = 5
-#   ComparisonCheck = no
-#   ConsistencyCheck = no
-#   IntersectionCheck = no
-}
-
-FormulaOptions
-{
-  Size = 1...13
-  Propositions = 6
-
-  AbbreviatedOperators = Yes
-  GenerateMode = Normal
-  OutputMode = Normal
-  PropositionPriority = 50
-
-  TruePriority = 1
-  FalsePriority = 1
-
-  AndPriority = 10
-  OrPriority = 10
-  XorPriority = 0
-  # EquivalencePriority = 0
-
-  BeforePriority = 0
-  StrongReleasePriority = 0
-  WeakUntilPriority = 0
-
-  DefaultOperatorPriority = 5
-}
-EOF
-
-${LBTT}
-rm config