Merge branch 'master' into ng/master

With lots of edits to solve *spurious* failures.

diff --cc Makefile.am
Simple merge

diff --cc README
Simple merge

diff --cc automake.in
Simple merge

diff --cc contrib/check-html.am
Simple merge

diff --cc doc/Makefile.am
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc lib/Automake/ChannelDefs.pm
Simple merge

diff --cc lib/Automake/Rule.pm
Simple merge

diff --cc lib/Automake/Variable.pm
Simple merge

diff --cc lib/am/check.am
Simple merge

diff --cc lib/am/configure.am
Simple merge

diff --cc lib/am/depend2.am
Simple merge

diff --cc lib/am/distdir.am
Simple merge

diff --cc lib/am/header-vars.am
index 1bfc5aef754570251ce2bec4a21553c59751c292,fe389036ced2e067f7ed81a19dd254aaa33637f6..ee4aa46f0f4db3af1b9c9461a815be3ba1e30463
--- 1/lib/am/header-vars.am
--- 2/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@@ -31,9 -27,13 +30,11 @@@ am__vpath_rewrite = 
  ## DESTDIR =
  
  ## Shell code that determines whether make is running in "dry mode"
 -## ("make -n") or not.  Useful in rules that invoke make recursively,
 -## and are thus executed also with "make -n" -- either because they
 -## are declared as dependencies to '.MAKE' (NetBSD make), or because
 -## their recipes contain the "$(MAKE)" string (GNU and Solari make).
 -
 +## ("make -n") or not.  Useful in rules that invoke make recursively, and
 +## are thus executed also with "make -n" -- because, say, their recipes
 +## contain the "$(MAKE)" string or starts with the '+' modifier.
+ ## The case statement has [:] in order to not tickle makefile-deps.test
+ ## which greps for '^ *:'.
  am__make_dryrun = \
    { \
      am__dry=no; \

diff --cc lib/am/install.am
Simple merge

diff --cc lib/am/lex.am
Simple merge

diff --cc lib/am/lisp.am
Simple merge

diff --cc lib/am/remake-hdr.am
Simple merge

diff --cc lib/am/subdirs.am
Simple merge

diff --cc lib/am/texi-vers.am
Simple merge

diff --cc lib/am/texibuild.am
Simple merge

diff --cc lib/am/yacc.am
index 1551232be24db9ac3c022d9888e0b10ac2799e17,4d53904b9d6c079872c870bd7d2ff6a786492551..e2a5bea8f50f064642ade913f9a4995cb3848bb4
--- 1/lib/am/yacc.am
--- 2/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@@ -41,7 -43,8 +43,8 @@@ endif %?FIRST
  
  ?GENERIC?%EXT%%DERIVED-EXT%:
  ?!GENERIC?%OBJ%: %SOURCE%
 -?GENERIC?     %VERBOSE%$(am__skipyacc) $(SHELL) $(YLWRAP) %SOURCE% y.tab.c %OBJ% y.tab.h `echo %OBJ% | $(am__yacc_c2h)` y.output %BASE%.output -- %COMPILE%
 -?!GENERIC?    %VERBOSE% \
 -?!GENERIC??DIST_SOURCE?       $(am__skipyacc) \
 -## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
 -?!GENERIC?    $(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% y.tab.c %OBJ% y.tab.h `echo %OBJ% | $(am__yacc_c2h)` y.output %BASE%.output -- %COMPILE%
 +?SUBDIROBJ?   %SILENT%test -d $(dir $@) || $(MKDIR_P) $(dir $@)
 +?GENERIC?     %VERBOSE%$(am__skipyacc) \
- ?!GENERIC??DIST_SOURCE?       %VERBOSE%$(am__skipyacc) \
-       $(SHELL) $(YLWRAP) $< y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
++-?!GENERIC??DIST_SOURCE?      %VERBOSE%$(am__skipyacc) \
++      $(SHELL) $(YLWRAP) $< y.tab.c %OBJ% y.tab.h %BASE%.h \
++      `echo %OBJ% | $(am__yacc_c2h)` y.output %BASE%.output -- %COMPILE%

diff --cc m4/Makefile.am
Simple merge

diff --cc m4/depend.m4
Simple merge

diff --cc m4/init.m4
Simple merge

diff --cc m4/silent.m4
Simple merge

diff --cc tests/Makefile.am
index becef59e1a3afcf56380d4fc745ab252e8d500a2,451a8f912afecb7afc321e91a499da5fc558f8cf..5f72e254b65a7384402910d13693f2e3ea790eb9
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -36,9 -34,10 +34,11 @@@ TESTS = ## Will be updated later
  
  XFAIL_TESTS = \
  all.test \
+ yacc-bison-skeleton-cxx.test \
+ yacc-bison-skeleton.test \
  cond17.test \
  gcj6.test \
 +interp3.test \
  override-conditional-2.test \
  java-nobase.test \
  objext-pr10128.test \

diff --cc tests/aclocal4.test
Simple merge

diff --cc tests/amopts-variable-expansion.test
Simple merge

diff --cc tests/canon.test
Simple merge

diff --cc tests/canon5.test
Simple merge

diff --cc tests/check-concurrency-bug9245.test
Simple merge

diff --cc tests/check10.test
Simple merge

diff --cc tests/check11.test
Simple merge

diff --cc tests/check4.test
Simple merge

diff --cc tests/check5.test
Simple merge

diff --cc tests/check7.test
Simple merge

diff --cc tests/check8.test
Simple merge

diff --cc tests/color.test
Simple merge

diff --cc tests/conffile-leading-dot.test
Simple merge

diff --cc tests/defs
index 9b54045c83cc325d420001ff4f672f127127a260,7af8f25fb294368682b13d5721ba8c2abb1cf579..a45fb2337662333046b7f485f50945b10c566f25
--- 1/tests/defs
--- 2/tests/defs
+++ b/tests/defs
@@@ -378,6 -378,116 +376,52 @@@ grep_configure_help (
    $EGREP "$2" am--our-help || Exit 1
  }
  
 -# using_gmake
 -# -----------
 -# Return success if $MAKE is GNU make, return failure otherwise.
 -# Caches the result for speed reasons.
 -using_gmake ()
 -{
 -  case $am__using_gmake in
 -    yes)
 -      return 0;;
 -    no)
 -      return 1;;
 -    '')
 -      # Use --version AND -v, because SGI Make doesn't fail on --version.
 -      # Also grep for GNU because newer versions of FreeBSD make do
 -      # not complain about `--version' (they seem to silently ignore it).
 -      if $MAKE --version -v | grep GNU; then
 -        am__using_gmake=yes
 -        return 0
 -      else
 -        am__using_gmake=no
 -        return 1
 -      fi;;
 -    *)
 -      fatal_ "invalid value for \$am__using_gmake: '$am__using_gmake'";;
 -  esac
 -}
 -am__using_gmake="" # Avoid interferences from the environment.
 -
 -# make_can_chain_suffix_rules
 -# ---------------------------
 -# Return 0 if $MAKE is a make implementation that can chain suffix rules
 -# automatically, return 1 otherwise.  Caches the result for speed reasons.
 -make_can_chain_suffix_rules ()
 -{
 -  if test -z "$am__can_chain_suffix_rules"; then
 -    if using_gmake; then
 -      am__can_chain_suffix_rules=yes
 -      return 0
 -    else
 -      mkdir am__chain.dir$$
 -      cd am__chain.dir$$
 -      unindent > Makefile << 'END'
 -        .SUFFIXES: .u .v .w
 -        .u.v: ; cp $< $@
 -        .v.w: ; cp $< $@
 -END
 -      echo make can chain suffix rules > foo.u
 -      if $MAKE foo.w && diff foo.u foo.w; then
 -        am__can_chain_suffix_rules=yes
 -      else
 -        am__can_chain_suffix_rules=no
 -      fi
 -      cd ..
 -      rm -rf am__chain.dir$$
 -    fi
 -  fi
 -  case $am__can_chain_suffix_rules in
 -    yes) return 0;;
 -     no) return 1;;
 -      *) fatal_ "make_can_chain_suffix_rules: internal error";;
 -  esac
 -}
 -am__can_chain_suffix_rules="" # Avoid interferences from the environment.
 -
+ # useless_vpath_rebuild
+ # ---------------------
+ # Tell whether $MAKE suffers of the bug triggering automake bug#7884.
+ # For example, this happens with FreeBSD make, since in a VPATH build
+ # it tends to rebuilt files for which there is an explicit or even just
+ # a suffix rule, even if said files are already available in the VPATH
+ # directory.
+ useless_vpath_rebuild ()
+ {
+   if test -z "$am__useless_vpath_rebuild"; then
+     if using_gmake; then
+       am__useless_vpath_rebuild=no
+       return 1
+     fi
+     mkdir am__vpath.dir$$
+     cd am__vpath.dir$$
+     touch foo.a foo.b bar baz
+     mkdir build
+     cd build
+     unindent > Makefile << 'END'
+         .SUFFIXES: .a .b
+         VPATH = ..
+         all: foo.b baz
+         .PHONY: all
+         .a.b: ; cp $< $@
+         baz: bar ; cp ../baz bar
+ END
+     if $MAKE all && test ! -f foo.b && test ! -f bar; then
+       am__useless_vpath_rebuild=no
+     else
+       am__useless_vpath_rebuild=yes
+     fi
+     cd ../..
+     rm -rf am__vpath.dir$$
+   fi
+   case $am__useless_vpath_rebuild in
+     yes) return 0;;
+      no) return 1;;
+      "") ;;
+       *) fatal_ "no_useless_builddir_remake: internal error";;
+   esac
+ }
+ am__useless_vpath_rebuild=""
+ 
+ yl_distcheck () { useless_vpath_rebuild || $MAKE distcheck ${1+"$@"}; }
+ 
  # seq_ - print a sequence of numbers
  # ----------------------------------
  # This function simulates GNU seq(1) portably.  Valid usages:

diff --cc tests/depcomp-shuffle-sub-vpath.test
Simple merge

diff --cc tests/depcomp-shuffle-sub.test
index c04eb122a56285558bac64fb808b47cccb510560,f9da113d4cb0b2c0c5937aec099b5b13556f8adf..9338508432a59183e95b5609c08920f7d14c4bc7
--- 1/tests/depcomp-shuffle-sub.test
--- 2/tests/percent.test
+++ b/tests/depcomp-shuffle-sub.test
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/sh
 +#! /bin/sh
- # Copyright (C) 2012 Free Software Foundation, Inc.
+ # Copyright (C) 2002-2012 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

diff --cc tests/depcomp-shuffle-vpath.test
Simple merge

diff --cc tests/depcomp-shuffle.test
Simple merge

diff --cc tests/depend.test
Simple merge

diff --cc tests/depend4.test
Simple merge

diff --cc tests/distcheck-configure-flags.test
Simple merge

diff --cc tests/distcheck-hook.test
Simple merge

diff --cc tests/distcheck-hook2.test
Simple merge

diff --cc tests/distcheck-missing-m4.test
Simple merge

diff --cc tests/distcheck-outdated-m4.test
Simple merge

diff --cc tests/distcheck-override-infodir.test
Simple merge

diff --cc tests/distdir.test
Simple merge

diff --cc tests/dollar.test
Simple merge

diff --cc tests/exeext.test
Simple merge

diff --cc tests/exsource.test
Simple merge

diff --cc tests/extra10.test
index 302ad770ba30bfa7af56f7066fc76eac4cf6b4ed,3f498b4f64697039ad6f87baac9629961db0b175..53a08300eae9047eaa73ef54db84ce1b3c4c7d45
--- 1/tests/extra10.test
--- 2/tests/extra10.test
+++ b/tests/extra10.test
@@@ -16,7 -16,10 +16,9 @@@
  
  # Check that wildcards in EXTRA_DIST are honoured.
  # Suggested by observations from Braden McDaniel.
+ # See also sister test 'extra11.test', that check a similar usage
+ # with the involvement of the $(wildcard) GNU make builtin.
  
 -required=GNUmake
  . ./defs || Exit 1
  
  echo AC_OUTPUT >> configure.in

diff --cc tests/extra11.test
Simple merge

diff --cc tests/extra12.test
Simple merge

diff --cc tests/fort2.test
Simple merge

diff --cc tests/gen-testsuite-part
Simple merge

diff --cc tests/gnumake.test
Simple merge

diff --cc tests/instdir-java.test
Simple merge

diff --cc tests/instdir-lisp.test
Simple merge

diff --cc tests/instdir-ltlib.test
Simple merge

diff --cc tests/instdir-prog.test
Simple merge

diff --cc tests/instdir-python.test
Simple merge

diff --cc tests/instdir-texi.test
Simple merge

diff --cc tests/instdir.test
Simple merge

diff --cc tests/instdir2.test
Simple merge

diff --cc tests/insthook.test
Simple merge

diff --cc tests/instmany-mans.test
Simple merge

diff --cc tests/instmany-python.test
Simple merge

diff --cc tests/instmany.test
Simple merge

diff --cc tests/instspc.tap
Simple merge

diff --cc tests/java-compile-run-flat.test
Simple merge

diff --cc tests/java-compile-run-nested.test
Simple merge

diff --cc tests/javaflags.test
Simple merge

diff --cc tests/lex5.test
index df2eb4e9b07d952aa5383e520e69d9421c93a2ed,616470b04cf04da03dcb93d014cfcd4d20995115..99fab8e2e352053b5dd09c7ace2f796b90643ea0
--- 1/tests/lex5.test
--- 2/tests/lex5.test
+++ b/tests/lex5.test
@@@ -82,10 -84,11 +84,10 @@@ EN
  $sleep
  
  $AUTOMAKE -a --no-force
- test -f ./ylwrap
  
  cd sub
 -using_gmake || $MAKE Makefile
  $MAKE foo/foo2.o
+ ls -l # For debugging.
  test -f foo/foo2.c
  test -f foo/foo2.o
  

diff --cc tests/lflags.test
Simple merge

diff --cc tests/lflags2.test
Simple merge

diff --cc tests/libobj19.test
Simple merge

diff --cc tests/libtool9.test
Simple merge

diff --cc tests/lisp8.test
Simple merge

diff --cc tests/list-of-tests.mk
index 03477099b917642b90dafef166bb92dc82bece06,119ebcac794b3be38b60037321390dd7fc5fbec2..48eaa450a6510f46c100db8280cc307f334e14db
--- 1/tests/list-of-tests.mk
--- 2/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@@ -2,8 -2,8 +2,7 @@@
  ## testsuite.  This fragment is meant to be included by the Makefile.am,
  ## but also to be executed directly by make when bootstrapping automake.
  
- ## Copyright (C) 2011, 2012 Free Software Foundation, Inc.
- ## Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+ ## Copyright (C) 2011-2012 Free Software Foundation, Inc.
 -## Copyright (C) 2011, 2012 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
@@@ -907,11 -920,12 +913,10 @@@ silentf77.test 
  silentf90.test \
  silent-many-gcc.test \
  silent-many-generic.test \
- silent-lex-gcc.test \
- silent-lex-generic.test \
- silent-yacc-gcc.test \
- silent-yacc-generic.test \
 -silent-nowarn.test \
  silent-configsite.test \
 -silent-nested-vars.test \
+ silent-lex.test \
+ silent-yacc.test \
+ silent-yacc-headers.test \
  srcsub.test \
  srcsub2.test \
  space.test \
@@@ -1177,14 -1188,28 +1179,29 @@@ yacc5.test 
  yacc7.test \
  yacc8.test \
  yaccdry.test \
- yacc-subobj-nodep.test \
- yacc-dist-nobuild.test \
- yacc-nodist.test \
  yaccpp.test \
  yaccvpath.test \
+ yacc-auxdir.test \
+ yacc-basic.test \
+ yacc-cxx.test \
+ yacc-bison-skeleton-cxx.test \
+ yacc-bison-skeleton.test \
+ yacc-clean.test \
+ yacc-clean-cxx.test \
+ yacc-d-basic.test \
+ yacc-d-cxx.test \
  yacc-d-vpath.test \
+ yacc-deleted-headers.test \
+ yacc-depend.test \
+ yacc-depend2.test \
  yacc-dist-nobuild-subdir.test \
+ yacc-dist-nobuild.test \
+ yacc-line.test \
+ yacc-mix-c-cxx.test \
+ yacc-nodist.test \
+ yacc-pr204.test \
++yacc-subobj-nodep.test \
+ yacc-weirdnames.test \
  yflags.test \
  yflags2.test \
  yflags-cmdline-override.test \

diff --cc tests/makej.test
Simple merge

diff --cc tests/maken.test
Simple merge

diff --cc tests/maken3.test
Simple merge

diff --cc tests/man3.test
Simple merge

diff --cc tests/mmodely.test
Simple merge

diff --cc tests/multlib.test
Simple merge

diff --cc tests/output6.test
Simple merge

diff --cc tests/parallel-tests-cmdline-override.test
Simple merge

diff --cc tests/parallel-tests-empty-testlogs.test
Simple merge

diff --cc tests/parallel-tests-exit-statuses.test
Simple merge

diff --cc tests/parallel-tests-extra-programs.test
Simple merge

diff --cc tests/parallel-tests-fork-bomb.test
Simple merge

diff --cc tests/parallel-tests-harderror.test
Simple merge

diff --cc tests/parallel-tests-log-compiler-1.test
Simple merge

diff --cc tests/parallel-tests-log-override-1.test
Simple merge

diff --cc tests/parallel-tests-log-override-2.test
Simple merge

diff --cc tests/parallel-tests-log-override-recheck.test
Simple merge

diff --cc tests/parallel-tests-no-color-in-log.test
Simple merge

diff --cc tests/parallel-tests.test
Simple merge

diff --cc tests/parallel-tests2.test
Simple merge

diff --cc tests/parallel-tests3.test
Simple merge

diff --cc tests/parallel-tests5.test
Simple merge

diff --cc tests/parallel-tests8.test
Simple merge

diff --cc tests/pattern-rules.test
Simple merge

diff --cc tests/pattern-rules2.test
Simple merge

diff --cc tests/pr8365-remake-timing.test
Simple merge

diff --cc tests/python-virtualenv.test
Simple merge

diff --cc tests/remake-all-1.test
Simple merge

diff --cc tests/remake-deleted-m4-file.test
Simple merge

diff --cc tests/remake-gnulib-add-acsubst.test
Simple merge

diff --cc tests/remake-gnulib-add-header.test
Simple merge

diff --cc tests/remake-gnulib-remove-header.test
Simple merge

diff --cc tests/remake-moved-m4-file.test
Simple merge

diff --cc tests/remake-renamed-am.test
Simple merge

diff --cc tests/remake-renamed-m4-file.test
Simple merge

diff --cc tests/remake-renamed-m4-macro-and-file.test
Simple merge

diff --cc tests/remake-renamed-m4-macro.test
Simple merge

diff --cc tests/remake-subdir-from-subdir.test
Simple merge

diff --cc tests/remake-subdir-gnu.test
Simple merge

diff --cc tests/remake-subdir-long-time.test
Simple merge

diff --cc tests/remake-subdir.test
Simple merge

diff --cc tests/remake10a.test
Simple merge

diff --cc tests/remake10b.test
Simple merge

diff --cc tests/remake10c.test
Simple merge

diff --cc tests/remake12.test
Simple merge

diff --cc tests/remake5.test
Simple merge

diff --cc tests/remake8a.test
Simple merge

diff --cc tests/remake8b.test
Simple merge

diff --cc tests/remake9a.test
Simple merge

diff --cc tests/remake9b.test
Simple merge

diff --cc tests/remake9c.test
Simple merge

diff --cc tests/remake9d.test
Simple merge

diff --cc tests/silent6.test
Simple merge

diff --cc tests/subobj11a.test
Simple merge

diff --cc tests/subobj11c.test
Simple merge

diff --cc tests/subobj4.test
Simple merge

diff --cc tests/subpkg-yacc.test
Simple merge

diff --cc tests/subst-no-trailing-empty-line.test
Simple merge

diff --cc tests/suffix-chain.tap
Simple merge

diff --cc tests/suffix10.tap
index 82229136dc35c2f0cd37954fe54696586f244b29,38ce8c68d79ccd04e871da58a22f5c949f7a4fe3..2fef1c1208df5c2f2c12cbfad7c8a184f3916a67
--- 1/tests/suffix10.tap
--- 2/tests/suffix10.tap
+++ b/tests/suffix10.tap
@@@ -42,9 -42,10 +42,9 @@@ libfoo_la_SOURCES = foo.x
          && echo 'void yyerror (char *s) {}' \
          && echo '%}' \
          && echo '%%' \
-         && echo 'WORD: "foo";' \
+         && echo 'foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};' \
          && echo '%%' \
 -## Account for VPATH issues on weaker make implementations.
 -        && cat `test -f '$<' || echo $(srcdir)/`$<; \
 +        && cat $<; \
        } > $@-t
        mv -f $@-t $@
  .PHONY: test

diff --cc tests/suffix11.tap
Simple merge

diff --cc tests/suffix12.test
Simple merge

diff --cc tests/suffix13.test
Simple merge

diff --cc tests/suffix3.tap
Simple merge

diff --cc tests/suffix5.test
Simple merge

diff --cc tests/suffix6b.test
Simple merge

diff --cc tests/suffix6c.test
Simple merge

diff --cc tests/suffix8.tap
Simple merge

diff --cc tests/tap-autonumber.test
Simple merge

diff --cc tests/tap-bailout-leading-space.test
Simple merge

diff --cc tests/tap-bailout-suppress-later-errors.test
Simple merge

diff --cc tests/tap-bailout.test
Simple merge

diff --cc tests/tap-basic.test
Simple merge

diff --cc tests/tap-color.test
Simple merge

diff --cc tests/tap-diagnostic.test
Simple merge

diff --cc tests/tap-doc2.test
Simple merge

diff --cc tests/tap-global-log.test
Simple merge

diff --cc tests/tap-global-result.test
Simple merge

diff --cc tests/tap-log.test
Simple merge

diff --cc tests/tap-merge-stdout-stderr.test
Simple merge

diff --cc tests/tap-msg0-bailout.test
Simple merge

diff --cc tests/tap-msg0-planskip.test
Simple merge

diff --cc tests/tap-out-of-order.test
Simple merge

diff --cc tests/tap-passthrough-exit.test
Simple merge

diff --cc tests/tap-passthrough.test
Simple merge

diff --cc tests/tap-plan-corner.test
Simple merge

diff --cc tests/tap-plan-leading-zero.test
Simple merge

diff --cc tests/tap-plan-malformed.test
Simple merge

diff --cc tests/tap-plan-middle.test
Simple merge

diff --cc tests/tap-plan-whitespace.test
Simple merge

diff --cc tests/tap-plan.test
Simple merge

diff --cc tests/tap-planskip-and-logging.test
Simple merge

diff --cc tests/tap-planskip-case-insensitive.test
Simple merge

diff --cc tests/tap-planskip-late.test
Simple merge

diff --cc tests/tap-planskip-unplanned-corner.test
Simple merge

diff --cc tests/tap-planskip-whitespace.test
Simple merge

diff --cc tests/tap-planskip.test
Simple merge

diff --cc tests/tap-realtime.test
Simple merge

diff --cc tests/tap-recheck-logs.test
Simple merge

diff --cc tests/tap-summary-aux.sh
Simple merge

diff --cc tests/tap-test-number-0.test
Simple merge

diff --cc tests/tap-unplanned.test
Simple merge

diff --cc tests/test-driver-custom-multitest-recheck2.test
Simple merge

diff --cc tests/test-driver-custom-multitest.test
Simple merge

diff --cc tests/test-driver-custom-xfail-tests.test
Simple merge

diff --cc tests/test-log.test
Simple merge

diff --cc tests/test-missing.test
Simple merge

diff --cc tests/test-trs-basic.test
Simple merge

diff --cc tests/test-trs-recover.test
Simple merge

diff --cc tests/test-trs-recover2.test
Simple merge

diff --cc tests/testsuite-summary-checks.sh
Simple merge

diff --cc tests/testsuite-summary-reference-log.test
Simple merge

diff --cc tests/txinfo21.test
Simple merge

diff --cc tests/vala-vpath.test
Simple merge

diff --cc tests/vala2.test
Simple merge

diff --cc tests/vala3.test
Simple merge

diff --cc tests/vala5.test
Simple merge

diff --cc tests/vars-assign.test
Simple merge

diff --cc tests/version7.test
Simple merge

diff --cc tests/warning-groups-win-over-strictness.test
Simple merge

diff --cc tests/warnings-override.test
Simple merge

diff --cc tests/warnings-precedence.test
Simple merge

diff --cc tests/warnings-strictness-interactions.test
Simple merge

diff --cc tests/warnings-win-over-strictness.test
Simple merge

diff --cc tests/yacc-dist-nobuild-subdir.test
Simple merge

diff --cc tests/yflags-cmdline-override.test
Simple merge

diff --cc tests/yflags.test
Simple merge

diff --cc tests/yflags2.test
Simple merge