Merge branch 'yacc-work'

diff --cc ChangeLog
index 7798c5ee8125c02eb9e8803a4bf6a774645a20d0,430f6ea689d20c4feec3e1415e831a85d864e47c..c062875f943079841c677416c270dbf942ddbc8a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,110 -1,30 +1,137 @@@
+ 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-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: more consistent checks about invalid options
 +      * tests/aclocal.test: Grepping of automake stderr for messages
 +      reporting invalid options made stricter.
 +      * tests/no-outdir-option.test: Likewise.  Also, create a dummy
 +      `Makefile.am', to ensure that the automake failures are really
 +      caused only by unrecognized options.
 +      * tests/automake.test: Added trailing `:' command.  Removed
 +      redundant checks on `--help' and `--version' option (already
 +      performed in the test `help*.test').
 +
 +2011-01-11   Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: enable 'errexit' shell flag by default.
 +      * tests/defs: Enable `errexit' shell flag (near the end).
 +      Removed redundant comment about the enabling of shell traces.
 +      * tests/README (Writing test cases): Update, and use nicer
 +      formatting in a couple of places.
 +      * All tests: Adjusted by removing now-redundant calls to
 +      'set -e'.
 +
 +2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: work around a texi+cygnus bug causing a spurious XFAIL
 +      * tests/txinfo5b.test: New test, like txinfo5.test but calling
 +      automake with the `-Wno-override' option to work around a bug
 +      in the texinfo + cygnus interaction.
 +      * tests/txinfo5.test: Update heading comments.
 +      * tests/Makefile.am (TEST): Updated.
 +
 +2011-01-09  Dave Hart  <davehart@gmail.com>  (tiny change)
 +
 +      Fix another typo in Rule.pm comment.
 +      * lib/Automake/Rule.pm: Fix typo.
 +
 +2011-01-09  Peter Rosin  <peda@lysator.liu.se>
 +
 +      Fix another typo in Rule.pm comment.
 +      * lib/Automake/Rule.pm: Fix typo.
 +
 +2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: texinfo unrecognized extensions
 +      * tests/txinfo-unrecognized-extension.test: New test.
 +      * tests/Makefile.am (TESTS): Update.
 +
 +      Improve, extend and tweak tests on Texinfo support.
 +      * tests/instdir-texi.test: Add a call to `ls -l' after that to
 +      `make', for debugging.  When looking for required tools, do not
 +      redirect the output of "$tool --help" to /dev/null, and do not
 +      uselessly run it in a subshell.
 +      * tests/txinfo.test: Rewritten to run autoconf, ./configure and
 +      make.  All checks moved into Makefile.am.
 +      * tests/txinfo8.test: Likewise, and modernize the generated
 +      configure.in.
 +      * tests/txinfo2.test: Moved checks into Makefile.am, and other
 +      minor improvements.
 +      * tests/txinfo5.test: Enable `errexit' shell flag, and related
 +      changes.  Add trailing `:' command.
 +      * tests/txinfo6.test: Likewise, and make grepping of generated
 +      Makefile.in stricter.
 +      * tests/txinfo7.test: Enable `errexit' shell flag, and related
 +      changes.  Add trailing `:' command.  Do not add unnecessary stuff
 +      to Makefile.am.
 +      * tests/txinfo9.test: Verify that more targets which are expected
 +      to be generated only once really are.  Make grepping less strict,
 +      to avoid exposing too much internal details.  More minor changes.
 +      * tests/txinfo16.test: Add trailing `:'.  Prefer cat over echo
 +      for appending to configure.in.  Updated/fixed heading comments.
 +      * tests/txinfo23.test: Likewise, and extended a little by making
 +      it check that no info file is created in the $(srcdir).
 +      * tests/txinfo24.test: Likewise.
 +      * tests/txinfo25.test: Likewise.
 +      * tests/txinfo18.test: Add trailing `:'.  Prefer cat over echo
 +      for appending to configure.in.  Also, check that index files are
 +      cleaned also by "make clean", not only by "make distclean".
 +      * tests/txinfo22.test: Prefer `$me' over hard-coded test name,
 +      and added trailing `:' command.  This testcase also used to check
 +      that automake ignores in-line comments when using variables, but
 +      preserves them in the output; these checks (added in commit
 +      "Release-1-7f-4-g9177ef8") do not really pertain to this test,
 +      so they have been moved ...
 +      * tests/comments-in-var-defn.test: ... into this new test.
 +      * tests/txinfo4.test: Escape literal dots in grep regexps.  Add
 +      trailing `:' command.
 +      * tests/txinfo29.test: Likewise.  Relax grepping of generated
 +      Makefile.in w.r.t. whitespaces.  Prefer `cat' over `echo' to
 +      append to configure.in.
 +      * tests/txinfo3.test: Likewise.
 +      * tests/vtexi.test: Improve grepping of Makefile.in (sometimes
 +      make it stricter, sometimes laxer).  Move `set -e' setting just
 +      after the inclusion of ./defs.  De-uglify a sed command.  Other
 +      minor cosmetic improvements.
 +      * tests/vtexi2.test: Make grepping of Makefile.in stricter.  Add
 +      trailing `:' command.
 +      * tests/vtexi3.test: New test on version.texi support.
 +      * tests/vtexi4.test: Likewise.
 +      * tests/Makefile.am (TESTS): Updated.
 +
 +2011-01-11   Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix spurious failure in 'tests/yflags-conditional.test'
 +      * tests/yflags-conditional.test: Filter out message "warnings are
 +      treated as errors" from automake stderr, to avoid a false positive
 +      when grepping for extraneous warning messages.
 +
  2011-01-10   Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        yacc: warn about conditional content in *YFLAGS variables

diff --cc tests/cond35.test
index 120a3ba3cf4936c994cd1fa572baa049e40a3f1c,34a7e7ff70341ff473f441b7e2325f65d0eecc97..c3c5f0bb593eca582c10e689524a70c72817d94f
--- 1/tests/cond35.test
--- 2/tests/cond35.test
+++ b/tests/cond35.test
@@@ -17,9 -17,11 +17,9 @@@
  # Check rules output for parser defined conditionally.
  # Report from Roman Fietze.
  
- required='flex bison gcc'
+ required='flex yacc gcc'
  . ./defs || Exit 1
  
 -set -e
 -
  cat >>configure.in <<'EOF'
  AM_CONDITIONAL([CASE_A], test -z "$case_B")
  AC_PROG_CC

diff --cc tests/cond36.test
index 6b9a74222894d398d48525e6f29217f363eed661,d06ed87bebcea936ae69b32c7ec981f533a28d32..a39ead03d912c6628d37c66afd8f8dda113a9e97
--- 1/tests/cond36.test
--- 2/tests/cond36.test
+++ b/tests/cond36.test
@@@ -16,9 -16,11 +16,9 @@@
  
  # Check rules output for parser defined conditionally.
  
- required='flex bison gcc'
+ required='flex yacc gcc'
  . ./defs || Exit 1
  
 -set -e
 -
  cat >>configure.in <<'EOF'
  AM_CONDITIONAL([CASE_A], test -z "$case_B")
  AC_PROG_CC

diff --cc tests/defs
index b5373a9caf268c4c4cfb607c0f226e08e12d27cb,dfb5f2ef3902df5628ba5937d2a00ee0c0a2eaad..64ed9856b4919ec3f21d35ad84294ba028b8c36b
--- 1/tests/defs
--- 2/tests/defs.in
+++ b/tests/defs
@@@ -292,24 -207,27 +285,40 @@@ d
      texi2dvi-o)
        # Texi2dvi supports `-o' since Texinfo 4.1.
        echo "$me: running texi2dvi -o /dev/null --version"
 -      ( texi2dvi -o /dev/null --version ) || exit 77
 +      texi2dvi -o /dev/null --version || exit 77
 +      ;;
 +    xsi-shell)
 +      # Try some XSI features.
 +      # Keep this in sync with libtool.m4:_LT_CHECK_SHELL_FEATURES.
 +      echo "$me: trying some XSI constructs"
 +      ( _am_dummy="a/b/c"
 +      test "${_am_dummy##*/},${_am_dummy%/*},${_am_dummy#??}"${_am_dummy%"$_am_dummy"}, \
 +              = c,a/b,b/c, \
 +      && eval 'test $(( 1 + 1 )) -eq 2 \
 +      && test "${#_am_dummy}" -eq 5' ) || exit 77
        ;;
 -    # Generic case: the tool must support --version.
+     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"
 +      # It is not likely but possible that $tool is a special builtin,
 +      # in which case the shell is allowed to exit after an error.
 +      # So, please leave the subshell here.
        ( $tool --version ) || exit 77
        ;;
    esac

diff --cc tests/pr204.test
index 0e69193d4b2c36b767470be16a5e94e03f3e9aaf,c87f895a1e2481ab506d5c09246264d9c403a2c5..27453e0fe00c618606a78302a94241a6e32827a6
--- 1/tests/pr204.test
--- 2/tests/pr204.test
+++ b/tests/pr204.test
@@@ -17,9 -17,11 +17,9 @@@
  # For PR 204.
  # Sources derived from nodist_ sources should not be distributed.
  
- required='bison gcc'
+ required='yacc gcc'
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in <<'EOF'
  AM_MAINTAINER_MODE
  AC_PROG_CC

diff --cc tests/silent-many-gcc.test
index 4bc7e8f4d211d1b2d9eb7b49c108b3e098e385c3,5e6d191ae19ba4e76027edc5fa8f184bfffb0c78..62dafa196b12de97d1fcab18b02929afcf535867
--- 1/tests/silent-many-gcc.test
--- 2/tests/silent-many-gcc.test
+++ b/tests/silent-many-gcc.test
@@@ -21,9 -21,11 +21,9 @@@
  # 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
 -
  # Avoids too much code duplication.
  do_and_check_silent_build ()
  {

diff --cc tests/silent-many-generic.test
index 5371dbb6bb9df3f6d25f6bf07fe4b75565c8c078,ed2744836844e263c4a9c7963fde5cde6e6546d9..b8864793ef9593e5d6b557b662354910c135eeaa
--- 1/tests/silent-many-generic.test
--- 2/tests/silent-many-generic.test
+++ b/tests/silent-many-generic.test
@@@ -23,9 -23,11 +23,9 @@@
  # 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
 -
  # Avoids too much code duplication.
  do_and_check_silent_build ()
  {

diff --cc tests/silent-yacc-gcc.test
index 009fe5eacb20b06c10fb77f2ae19c5f76e3fd657,83e6ebee2ffb9d37dd97ede01f07140e55830911..624b2cd86e783c9cdf0888dd22559eb9e1613e65
--- 1/tests/silent-yacc-gcc.test
--- 2/tests/silent-yacc-gcc.test
+++ b/tests/silent-yacc-gcc.test
@@@ -17,9 -17,11 +17,9 @@@
  # 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
 -
  mkdir sub
  
  cat >>configure.in <<'EOF'

diff --cc tests/silent-yacc-generic.test
index 8c7f70a870c6a74257a7e7e9bae11269c672f675,553e78bc589770bedae6960c9fa8daf13b557964..76a290f486f6be7756c295a3be8f9861ed718a87
--- 1/tests/silent-yacc-generic.test
--- 2/tests/silent-yacc-generic.test
+++ b/tests/silent-yacc-generic.test
@@@ -17,9 -17,11 +17,9 @@@
  # 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
 -
  mkdir sub
  
  cat >>configure.in <<'EOF'

diff --cc tests/subpkg.test
index dee41f74f5fb1174cb9bcb30f02cb3e03881b43d,0eea79dc3426e79be04389917ff2ed5df779a8e9..481cbb47874e73d50b898839b534a81b3fe3e91e
--- 1/tests/subpkg.test
--- 2/tests/subpkg.test
+++ b/tests/subpkg.test
@@@ -17,9 -17,11 +17,9 @@@
  
  # Check subpackage handling.
  
- required='gcc bison'
+ required='gcc yacc'
  . ./defs || Exit 1
  
 -set -e
 -
  mkdir m4
  
  cat >m4/foo.m4 <<'EOF'

diff --cc tests/suffix10.test
index 973f81825078addd69d761bbe14ee7486d73a570,e2444556137f0e2c5303d3502966d56c7e8c3242..8160a8d74aebc22a1c24c366c193ebbbffe6c71d
--- 1/tests/suffix10.test
--- 2/tests/suffix10.test
+++ b/tests/suffix10.test
@@@ -17,9 -17,11 +17,9 @@@
  # Make sure that derivations work with .lo too.
  # (related to PR/37)
  
- required='libtoolize bison'
+ required='libtoolize yacc'
  . ./defs || Exit 1
  
 -set -e
 -
  cat >>configure.in <<EOF
  AC_PROG_CC
  AC_PROG_YACC

diff --cc tests/yacc-basic.test
index 3e29e797c2fd3dc5a9213b8bc267ae3fff3e68f7,4faea9547b40a13ba913212516528e73930fd74e..26dc4a90259c23547cc4f389585120e31a0b1c1e
--- 1/tests/yacc-basic.test
--- 2/tests/yacc-basic.test
+++ b/tests/yacc-basic.test
@@@ -16,9 -16,11 +16,9 @@@
  
  # Basic semantic checks on Yacc support.
  
- required=bison
+ required=yacc
  . ./defs || Exit 1
  
 -set -e
 -
  distdir=$me-1.0
  
  cat >> configure.in << 'END'

diff --cc tests/yacc-clean.test
index cc3f12449557bc50a30ad36cb16b927a07f8ef7d,c8e8863b9e6e866e48216978437d66de44c37b47..a05e5f23d8e7172d3b174d5368e802c95e19cc32
--- 1/tests/yacc-clean.test
--- 2/tests/yacc-clean.test
+++ b/tests/yacc-clean.test
@@@ -18,9 -18,11 +18,9 @@@
  # 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
 -
  cat >> configure.in << 'END'
  AC_PROG_CC
  AC_PROG_YACC

diff --cc tests/yacc-d-basic.test
index 8af44abd4bf26077a17ef2ea63c5df8a61b7b0eb,11e5ba3002ec798938a6ca7ca7a9781df2578760..ae60084f1c7abf42c9bfa46d81318ad4124e23b1
--- 1/tests/yacc-d-basic.test
--- 2/tests/yacc-d-basic.test
+++ b/tests/yacc-d-basic.test
@@@ -17,9 -17,11 +17,9 @@@
  # 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
 -
  tab=' '
  distdir=$me-1.0
  

diff --cc tests/yacc-d-vpath.test
index 74d254cd1f4e3441a13c5856de1cca03a32cf0eb,bb099904aad8266e61ee7447d33ee429635a6faa..b331bf581661e834e7e0da7bbdfcd36b654dd49a
--- 1/tests/yacc-d-vpath.test
--- 2/tests/yacc-d-vpath.test
+++ b/tests/yacc-d-vpath.test
@@@ -22,9 -22,11 +22,9 @@@
  
  # Please keep this in sync with sister test `yaccvpath.test'.
  
- required=bison
+ required=yacc
  . ./defs || Exit 1
  
 -set -e
 -
  distdir=$me-1.0
  
  cat >> configure.in << 'END'

diff --cc tests/yacc-dist-nobuild.test
index 765517b13b44af1062f8153c2618c828447d0452,9061f579e04a9b4304e0906884f04058508762b9..85a960dc8ef80cddbbe7dca58b13010d2a26633c
--- 1/tests/yacc-dist-nobuild.test
--- 2/tests/yacc-dist-nobuild.test
+++ b/tests/yacc-dist-nobuild.test
@@@ -17,9 -17,11 +17,9 @@@
  # Check that distributed Yacc-generated parsers are not uselessly
  # remade from an unpacked distributed tarball.
  
- required=bison
+ required=yacc
  . ./defs || Exit 1
  
 -set -e
 -
  distdir=$me-1.0
  
  cat >> configure.in << 'END'

diff --cc tests/yacc-nodist.test
index ebef384e4739807b3a16d3672e4f4d5ed05acf46,46b4167b2678edf05bc07649eeb8ccc7515433f6..c55f40035994e43df230de53f40171e7c07b6fdb
--- 1/tests/yacc-nodist.test
--- 2/tests/yacc-nodist.test
+++ b/tests/yacc-nodist.test
@@@ -16,9 -16,11 +16,9 @@@
  
  # Checks for .c and .h files derived from non-distributed .y sources.
  
- required=bison
+ required=yacc
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in << 'END'
  AC_PROG_CC
  AC_PROG_YACC

diff --cc tests/yacc4.test
index 8f272b25e67d89da3cf8df05e1b58a7b31759a6b,1d508edc08ed843b1413d321349aeabb85eaa961..06376ec4caa4ef6ee9bc1fa673020ae8ed72b64c
--- 1/tests/yacc4.test
--- 2/tests/yacc4.test
+++ b/tests/yacc4.test
@@@ -16,9 -16,11 +16,9 @@@
  
  # Some simple tests of ylwrap functionality.
  
- required='bison gcc'
+ required='yacc gcc'
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in << 'END'
  AC_PROG_CC
  AC_PROG_YACC

diff --cc tests/yacc6.test
index 10507569c48f6084e1bf10b45e41cc21b352046e,bbb587e4296c783262386bbb226625bc3984154a..c127d15d772ae86d6786e8714be0e45116a5e8d2
--- 1/tests/yacc6.test
--- 2/tests/yacc6.test
+++ b/tests/yacc6.test
@@@ -20,9 -20,11 +20,9 @@@
  # 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
 -
  cat > configure.in << 'END'
  AC_INIT([yacc6], [1.0])
  # `aux' is not an acceptable file/directory name on Windows systems

diff --cc tests/yacc7.test
index ce236dfa433b60a56123b80a311c5975a9d2f30e,6d4815d780d3fe04ede51290f1e1686f566f2b83..5cea7afc526fef5ee0d10c76cc29c50556602c64
--- 1/tests/yacc7.test
--- 2/tests/yacc7.test
+++ b/tests/yacc7.test
@@@ -21,9 -21,11 +21,9 @@@
  # Also check that the sources of the generated parser are distributed.
  # PR/47.
  
- required=bison
+ required=yacc
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in << 'END'
  AC_PROG_CC
  AC_PROG_YACC

diff --cc tests/yacc8.test
Simple merge

diff --cc tests/yaccdry.test
index 4daa04af51ce4891b8b436cf9dc0d7dacad6298d,d30fb802e602dc56cb67c215180ce70aa7565080..f30e7f3f28b5736f4b658ce5a391aa8d076a6782
--- 1/tests/yaccdry.test
--- 2/tests/yaccdry.test
+++ b/tests/yaccdry.test
@@@ -16,9 -16,11 +16,9 @@@
  
  # Removal recovery rules for headers should not remove files with `make -n'.
  
- required=bison
+ required=yacc
  . ./defs || Exit 1
  
 -set -e
 -
  cat >> configure.in << 'END'
  AC_PROG_CC
  AC_PROG_YACC

diff --cc tests/yaccvpath.test
index 170936ffd1e3314b3c50ad91b402a703bbd57bbd,52092fa2bacc6b6b92070e24f9760f207c753081..c998373c6844d06209da19e975c93d4ff6f834e9
--- 1/tests/yaccvpath.test
--- 2/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@@ -23,9 -23,11 +23,9 @@@
  
  # Please keep this in sync with sister test `yacc-d-vpath.test'.
  
- required=bison
+ required=yacc
  . ./defs || Exit 1
  
 -set -e
 -
  distdir=$me-1.0
  
  cat >> configure.in << 'END'