Merge branch 'maint' into yacc-work

With some edits to `tests/defs.in', and a new ChangeLog entry
to reflect this.

diff --cc ChangeLog
index 468e4f1,3d87b6b..fef3648
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,130 +1,146 @@@
+ 2011-05-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
++      tests defs: merge cleanup
++      (flex, bison): Requirements removed, we have real `lex' and `yacc'
++      requirements now.
++
++2011-05-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
+       tests defs: allow requirements for compilers (mostly dummy)
+       Most of the new requirements that are now accepted in `$required'
+       as consequence of this patch are still dummy.  They are planned
+       to be implemented only in master (or in some derived branch), but
+       having them here (even just as no-op) will allow for an easier
+       integration/backporting of potential new testcases.
+       * tests/defs.in (cc, c++, fortran, fortran77): New requirements,
+       still dummy.
+       (flex): New requirement, picking LEX for configure.
+       (lex): New requirement, alias for `flex'.  A more appropriate
+       implementation, looking for a generic `lex' program, will follow
+       in the future.
+       (yacc): New requirement, alias for `bison'.  A more appropriate
+       implementation, looking for a generic `yacc' program, will follow
+       in the future.
+ 
+ 2011-04-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix spurious failure in a test on TESTS (VPATH-related)
+       * check-tests-in-builddir.test: When not using the parallel-tests
+       option, do not check that VPATH components are not present in the
+       displayed test name, since the simple-tests driver do not try to
+       strip them.
+ 
+ 2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       test: self check subroutines for skipping/failing of tests
+       * tests/self-check-report.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+ 
+ 2011-04-23  Jim Meyering  <meyering@redhat.com>
+           Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       test defs: new subroutines for test skipping/failing
+       * tests/defs.in (Exit): Move definition of this function earlier.
+       (warn_, skip_, fail_, framework_failure_): New functions, inspired
+       to the homonyms in gnulib's tests/init.sh.
+       ($stderr_fileno_): New global variable, used by the new functions
+       above.
+       * tests/README: Updated.
+       From a suggestion by Ralf Wildenhues.
+ 
+ 2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix typo (copy & paste blunder) in heading comment
+       * tests/maintclean-vpath.test: Correctly refer to the sister test
+       as `maintclean.test', not as `maintclean-vpath.test'.
+ 
+ 2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: remove redundant test `mclean.test'
+       * tests/mclean.test: Remove, it's a weak grepping test completely
+       superseded by the much more complete `maintclean.test'.
+       * tests/Makefile.am (TESTS): Update.
+ 
+ 2011-04-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       testsuite: more environment sanitization
+       * tests/defs.in: Sanity check: abort if any of `parallel_tests'
+       or `required' is in the environment.
+       ($sed_unindent_prog): Initialize to empty, to avoid interferences
+       from the environment.
+       * tests/self-check-me-in-env.test: Renamed to ...
+       * tests/self-check-env-sanitize.test: ... this, and extended.
+       * tests/Makefile.am (TESTS): Update.
+       (TESTS_ENVIRONMENT): Unset variables `parallel_tests' and
+       `required'.  Adjust comments.
+ 
+ 2011-04-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: don't allow `$me' to be overridden from the environment
+       * tests/defs.in: Sanity check: abort if $me is in the environment.
+       * tests/self-check-me-in-env.test: New test.
+       * tests/Makefile.am (TESTS_ENVIRONMENT): Unset variable `me'.
+       (TESTS): Update.
+       Suggestion by Ralf Wildenhues.
+ 
+ 2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       test defs: allow overriding of `$me'
+       * tests/defs.in ($me): Allow overriding by the including test
+       script.  Add some explicative comments.
+ 
+ 2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       depcomp tests: don't reject slower dependency extractors
+       * tests/depcomp8b.test: Add the `--enable-dependency-tracking'
+       option to `configure' invocations, so that slower dependency
+       extractors are not rejected.
+       * tests/depcomp8b.test: Likewise.  Also ...
+       (foo.c): ... since we are at it, fix spacing to be consistent
+       with GNU coding standards.
+ 
+ 2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       m4: add missing serial numbers to a few files
+       Related to automake bug#8483.
+       * m4/amversion.in: Add serial number.
+       * m4/auxdir.m4: Likewise.
+       * m4/gcj.m4: Likewise.
+       * m4/install-sh.m4: Likewise.
+       * m4/mkdirp.m4: Likewise.
+       * m4/python.m4: Likewise.
+       * m4/runlog.m4: Likewise.
+       * m4/strip.m4: Likewise.
+       * m4/upc.m4: Likewise.
+ 
+ 2011-04-16  Jim Meyering  <meyering@redhat.com>
+ 
+       depcomp: correct invalid sed invocation
+       * lib/depcomp: Insert missing -e before '/:$/d'.
+       Otherwise, that use of sed would treat '/:$/d' as a file name.
+ 
+ 2011-04-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       maintainer check: quote literal `$' in Makefile rule
+       * Makefile.am (sc_tests_PATH_SEPARATOR): Escape literal `$'
+       character in double-quoted string.  Fix a bug in which the rule
+       emitted an erroneously empty substring in its error message.
+ 
  2011-04-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 -      coverage: test for automake bug#8485 (known regression)
 -      * tests/yacc-dist-nobuild-subdir.test: New test.
 -      * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
 +      lex/yacc tests: remove redundant $distdir definition
 +      * tests/lex3.test ($distdir): Remove definition, that's already
 +      done in `tests/defs'.
 +      * tests/lexvpath.test: Likewise.
 +      * tests/yacc-basic.test: Likewise.
 +      * tests/yacc-cxx.test: Likewise.
 +      * tests/yacc-d-basic.test: Likewise.
 +      * tests/yacc-d-cxx.test: Likewise.
 +      * tests/yacc-d-vpath.test: Likewise.
 +      * tests/yacc-dist-nobuild-subdir.test: Likewise.
 +      * tests/yacc-dist-nobuild.test: Likewise.
 +      * tests/yacc-mix-c-cxx.test: Likewise.
 +      * tests/yaccvpath.test: Likewise.
  
  2011-04-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
  

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/defs.in
index c4f3d0e,8f9534e..f65256c
--- 1/tests/defs.in
--- 2/tests/defs.in
+++ b/tests/defs.in
@@@ -111,6 -153,23 +155,9 @@@ d
    # Check that each required tool is present.
    case $tool in
      :) ;;
 -    bison|yacc)
 -      # Since bison is required, we pick YACC for ./configure.
 -      YACC='bison -y'
 -      export YACC
 -      echo "$me: running bison --version"
 -      ( bison --version ) || exit 77
 -      ;;
 -    flex|lex)
 -      # Since flex is required, we pick LEX for ./configure.
 -      LEX=flex
 -      export LEX
 -      echo "$me: running flex --version"
 -      flex --version || exit 77
 -      ;;
+     cc|c++|fortran|fortran77)
+       echo "$me: dummy requirement '$tool', no check done"
+       ;;
      bzip2)
        # Do not use --version, bzip2 still tries to compress stdin.
        echo "$me: running bzip2 --help"