tests: do not force yacc-requiring tests to use bison

* tests/defs.in: New required entry 'yacc'.  Remove old
required entry 'bison'.
* tests/cond35.test ($required): Require yacc, not bison.
* tests/cond36.test: Likewise.
* tests/pr204.test: Likewise.
* tests/silent-many-gcc.test: Likewise.
* tests/silent-many-generic.test: Likewise.
* tests/silent-yacc-gcc.test: Likewise.
* tests/silent-yacc-generic.test: Likewise.
* tests/subpkg.test: Likewise.
* tests/suffix10.test: Likewise.
* tests/yacc-basic.test: Likewise.
* tests/yacc-clean.test: Likewise.
* tests/yacc-d-basic.test: Likewise.
* tests/yacc-d-vpath.test: Likewise.
* tests/yacc-dist-nobuild.test: Likewise.
* tests/yacc-nodist.test: Likewise.
* tests/yacc4.test: Likewise.
* tests/yacc6.test: Likewise.
* tests/yacc7.test: Likewise.
* tests/yacc8.test: Likewise.
* tests/yaccdry.test: Likewise.
* tests/yaccvpath.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 90eb69ec2ae9642be494274ea409f7e75edc155b..430f6ea689d20c4feec3e1415e831a85d864e47c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: do not force yacc-requiring tests to use bison
+       * tests/defs.in: New required entry 'yacc'.  Remove old
+       required entry 'bison'.
+       * tests/cond35.test ($required): Require yacc, not bison.
+       * tests/cond36.test: Likewise.
+       * tests/pr204.test: Likewise.
+       * tests/silent-many-gcc.test: Likewise.
+       * tests/silent-many-generic.test: Likewise.
+       * tests/silent-yacc-gcc.test: Likewise.
+       * tests/silent-yacc-generic.test: Likewise.
+       * tests/subpkg.test: Likewise.
+       * tests/suffix10.test: Likewise.
+       * tests/yacc-basic.test: Likewise.
+       * tests/yacc-clean.test: Likewise.
+       * tests/yacc-d-basic.test: Likewise.
+       * tests/yacc-d-vpath.test: Likewise.
+       * tests/yacc-dist-nobuild.test: Likewise.
+       * tests/yacc-nodist.test: Likewise.
+       * tests/yacc4.test: Likewise.
+       * tests/yacc6.test: Likewise.
+       * tests/yacc7.test: Likewise.
+       * tests/yacc8.test: Likewise.
+       * tests/yaccdry.test: Likewise.
+       * tests/yaccvpath.test: Likewise.
+
 2011-01-10   Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        yacc: warn about conditional content in *YFLAGS variables

diff --git a/tests/cond35.test b/tests/cond35.test
index 0f3b8cf8c2bc2543ceb02a38124aac61b4a454ff..34a7e7ff70341ff473f441b7e2325f65d0eecc97 100755 (executable)
--- a/tests/cond35.test
+++ b/tests/cond35.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 # Check rules output for parser defined conditionally.
 # Report from Roman Fietze.
 
-required='flex bison gcc'
+required='flex yacc gcc'
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/cond36.test b/tests/cond36.test
index f6c97dbd663bb6278dfd9f3650a3eccb81025490..d06ed87bebcea936ae69b32c7ec981f533a28d32 100755 (executable)
--- a/tests/cond36.test
+++ b/tests/cond36.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 # Check rules output for parser defined conditionally.
 
-required='flex bison gcc'
+required='flex yacc gcc'
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/defs.in b/tests/defs.in
index ee19dbe9a1aa598eb546d0b85ddbb9321422c587..dfb5f2ef3902df5628ba5937d2a00ee0c0a2eaad 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -93,13 +93,6 @@ do
   # Check that each required tool is present.
   case $tool in
     :) ;;
-    bison)
-      # Since bison is required, we pick YACC for ./configure.
-      YACC='bison -y'
-      export YACC
-      echo "$me: running bison --version"
-      ( bison --version ) || exit 77
-      ;;
     bzip2)
       # Do not use --version, bzip2 still tries to compress stdin.
       echo "$me: running bzip2 --help"
@@ -216,6 +209,22 @@ do
       echo "$me: running texi2dvi -o /dev/null --version"
       ( texi2dvi -o /dev/null --version ) || exit 77
       ;;
+    yacc)
+      if test x"$YACC" = x"no"; then
+        # The user has explicitly told he doesn't want a yacc program
+        # to be used.
+        echo "$me: \$YACC is \"no\", skipping test" >&2
+        exit 77
+      elif test -z "$YACC"; then
+        # The user hasn't explicitly specified any yacc program in the
+        # environment, so we try to use bison, skipping the test if it's
+        # not found.
+        YACC='bison -y'
+        export YACC
+        echo "$me: running bison --version"
+        bison --version || exit 77
+      fi
+      ;;
     # Generic case: the tool must support --version.
     *)
       echo "$me: running $tool --version"

diff --git a/tests/pr204.test b/tests/pr204.test
index 22a1e54f58e3e377087eb9566c6b9eaaa51f1893..c87f895a1e2481ab506d5c09246264d9c403a2c5 100755 (executable)
--- a/tests/pr204.test
+++ b/tests/pr204.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2004, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2010, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 # For PR 204.
 # Sources derived from nodist_ sources should not be distributed.
 
-required='bison gcc'
+required='yacc gcc'
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/silent-many-gcc.test b/tests/silent-many-gcc.test
index d770a467c17ce862e9e3dd58615b5d37f03289f3..5e6d191ae19ba4e76027edc5fa8f184bfffb0c78 100755 (executable)
--- a/tests/silent-many-gcc.test
+++ b/tests/silent-many-gcc.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 # This test requires the GNU compilers; keep it in sync with sister test
 # `silent-many-generic.test', which should work with generic compilers.
 
-required='gcc g++ gfortran flex bison'
+required='gcc g++ gfortran flex yacc'
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/silent-many-generic.test b/tests/silent-many-generic.test
index 223a97c64811a0e2a07f627f8fb7e19a03f8706d..ed2744836844e263c4a9c7963fde5cde6e6546d9 100755 (executable)
--- a/tests/silent-many-generic.test
+++ b/tests/silent-many-generic.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 # and forces the use of gcc depmode.
 
 # FIXME: generic C++/Fortran compilers should suffice here
-required='g++ gfortran flex bison'
+required='g++ gfortran flex yacc'
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/silent-yacc-gcc.test b/tests/silent-yacc-gcc.test
index 33ae8aefc6bea30e8cbc3b79b2a23a299e11ff22..83e6ebee2ffb9d37dd97ede01f07140e55830911 100755 (executable)
--- a/tests/silent-yacc-gcc.test
+++ b/tests/silent-yacc-gcc.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 # Check silent-rules mode for Yacc, forcing gcc depmode.
 # Keep this in sync with sister test `silent-yacc-generic.test'.
 
-required='gcc bison'
+required='gcc yacc'
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/silent-yacc-generic.test b/tests/silent-yacc-generic.test
index b7489dac99b444de9c4cf25db9a142cce4541852..553e78bc589770bedae6960c9fa8daf13b557964 100755 (executable)
--- a/tests/silent-yacc-generic.test
+++ b/tests/silent-yacc-generic.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 # Check silent-rules mode for Yacc.
 # Keep this in sync with sister test `silent-yacc-gcc.test'.
 
-required='bison'
+required=yacc
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/subpkg.test b/tests/subpkg.test
index 36629372653a75a83cfb6ba9768ec7597df875ed..0eea79dc3426e79be04389917ff2ed5df779a8e9 100755 (executable)
--- a/tests/subpkg.test
+++ b/tests/subpkg.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
 
 # Check subpackage handling.
 
-required='gcc bison'
+required='gcc yacc'
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/suffix10.test b/tests/suffix10.test
index 131359c8fc58eff6c365650de4a195777213b72c..e2444556137f0e2c5303d3502966d56c7e8c3242 100755 (executable)
--- a/tests/suffix10.test
+++ b/tests/suffix10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 # Make sure that derivations work with .lo too.
 # (related to PR/37)
 
-required='libtoolize bison'
+required='libtoolize yacc'
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yacc-basic.test b/tests/yacc-basic.test
index e8bf27d002f6ac8db98283f27bc92166e4b240d7..4faea9547b40a13ba913212516528e73930fd74e 100755 (executable)
--- a/tests/yacc-basic.test
+++ b/tests/yacc-basic.test
@@ -16,7 +16,7 @@
 
 # Basic semantic checks on Yacc support.
 
-required=bison
+required=yacc
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yacc-clean.test b/tests/yacc-clean.test
index d6a3fcaa84654da83220a488e5cbe44aa8ba346c..c8e8863b9e6e866e48216978437d66de44c37b47 100755 (executable)
--- a/tests/yacc-clean.test
+++ b/tests/yacc-clean.test
@@ -18,7 +18,7 @@
 # are cleaned by "make clean", while .c and .h files derived from
 # distributed .y sources are cleaned by "make maintainer-clean".
 
-required=bison
+required=yacc
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yacc-d-basic.test b/tests/yacc-d-basic.test
index f5f88d8afc909a80fe10468995db8ef0484ecfb6..11e5ba3002ec798938a6ca7ca7a9781df2578760 100755 (executable)
--- a/tests/yacc-d-basic.test
+++ b/tests/yacc-d-basic.test
@@ -17,7 +17,7 @@
 # Tests on basic Yacc support for when we have -d in YFLAGS, AM_YFLAGS
 # or maude_YFLAGS.
 
-required=bison
+required=yacc
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yacc-d-vpath.test b/tests/yacc-d-vpath.test
index 0edaaa8a40182b29a0f3995646891238250dfc38..bb099904aad8266e61ee7447d33ee429635a6faa 100755 (executable)
--- a/tests/yacc-d-vpath.test
+++ b/tests/yacc-d-vpath.test
@@ -22,7 +22,7 @@
 
 # Please keep this in sync with sister test `yaccvpath.test'.
 
-required=bison
+required=yacc
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yacc-dist-nobuild.test b/tests/yacc-dist-nobuild.test
index a6444dea155d60c78354a61c25638cc6b87448a9..9061f579e04a9b4304e0906884f04058508762b9 100755 (executable)
--- a/tests/yacc-dist-nobuild.test
+++ b/tests/yacc-dist-nobuild.test
@@ -17,7 +17,7 @@
 # Check that distributed Yacc-generated parsers are not uselessly
 # remade from an unpacked distributed tarball.
 
-required=bison
+required=yacc
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yacc-nodist.test b/tests/yacc-nodist.test
index 2b4ce09a547cb2fdcccf99f051193a129e0f7ff9..46b4167b2678edf05bc07649eeb8ccc7515433f6 100755 (executable)
--- a/tests/yacc-nodist.test
+++ b/tests/yacc-nodist.test
@@ -16,7 +16,7 @@
 
 # Checks for .c and .h files derived from non-distributed .y sources.
 
-required=bison
+required=yacc
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yacc4.test b/tests/yacc4.test
index bb252908d49e99126124108eca7d67e3bca5c424..1d508edc08ed843b1413d321349aeabb85eaa961 100755 (executable)
--- a/tests/yacc4.test
+++ b/tests/yacc4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 # Some simple tests of ylwrap functionality.
 
-required='bison gcc'
+required='yacc gcc'
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yacc6.test b/tests/yacc6.test
index b9b259bb34dab6c6e3c56141a0e48bab0b8b5f8a..bbb587e4296c783262386bbb226625bc3984154a 100755 (executable)
--- a/tests/yacc6.test
+++ b/tests/yacc6.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2010, 2011 Free
+# Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 # Also make sure depcomp does not needlessly update headers.
 # Report from Paolo Bonzini.
 
-required='gcc bison GNUmake'
+required='gcc yacc GNUmake'
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yacc7.test b/tests/yacc7.test
index 2b866bc9aedb2820c8578f4ea3d187a9b6d9cbce..6d4815d780d3fe04ede51290f1e1686f566f2b83 100755 (executable)
--- a/tests/yacc7.test
+++ b/tests/yacc7.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2010, 2011 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 # Also check that the sources of the generated parser are distributed.
 # PR/47.
 
-required=bison
+required=yacc
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yacc8.test b/tests/yacc8.test
index 797f4e76a13015fad3ad398d4d907005be5cf820..a683c8d0eeeb8ac40e55e837f1a7b577852b74a2 100755 (executable)
--- a/tests/yacc8.test
+++ b/tests/yacc8.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2003, 2004, 2006, 2010, 2011 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 
 # Test for subdir parsers.
 
-required="gcc bison"
+required="gcc yacc"
 
 . ./defs || Exit 1
 

diff --git a/tests/yaccdry.test b/tests/yaccdry.test
index d2e76323148bd72c9223ffc06d728e4c358e1776..d30fb802e602dc56cb67c215180ce70aa7565080 100755 (executable)
--- a/tests/yaccdry.test
+++ b/tests/yaccdry.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 # Removal recovery rules for headers should not remove files with `make -n'.
 
-required=bison
+required=yacc
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index c4dc400ca4eca2410c86a1238844082681212d03..52092fa2bacc6b6b92070e24f9760f207c753081 100755 (executable)
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -23,7 +23,7 @@
 
 # Please keep this in sync with sister test `yacc-d-vpath.test'.
 
-required=bison
+required=yacc
 . ./defs || Exit 1
 
 set -e