Merge branch 'master' into ng/master

* master:
  fixup: s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/ in 't/confsub.sh'
  tests: fix a spurious failure with dash
  test defs: fix indentation (cosmetic change)
  tests: remove obsolete uses of $sh_errexit_works
  configure: search a sturdy POSIX shell to be used in the testsuite
  tests: shell running test scripts is now named AM_TEST_RUNNER_SHELL
  fixup: distribute t/README
  init: warn against obsolete usage of AM_INIT_AUTOMAKE

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc Makefile.am
index 4509e001c68c23254429618c1199d5892b8550b8,a6129c32d5f90502408d4832c22e95e0534739ff..60807b53cdce92d7534d9d78f27e73288683502f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -333,62 -322,9 +333,62 @@@ TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(
  
  AM_TAP_LOG_DRIVER_FLAGS = --merge
  
- EXTRA_DIST += t/ax/is
+ EXTRA_DIST += t/README t/ax/is
  
 -TESTS = ## Will be updated later.
 +# All tests, both hand-written and autogenerated.
 +# IMPORTANT: This assumes that the autogenerated tests are placed
 +#            in the $(srcdir) as well!
 +all_TESTS = \
 +  $(wildcard $(srcdir)/t/*.sh) \
 +  $(wildcard $(srcdir)/t/*.tap) \
 +  $(wildcard $(srcdir)/t/pm/*.pl)
 +
 +# This is to ensure longer-running tests will be run earlier, which is
 +# useful when running the testsuite in parallel on multicore machines.
 +# Here too we assume that the autogenerated tests are placed in $(srcdir).
 +long_running_TESTS = \
 +  $(srcdir)/t/add-missing.tap \
 +  $(srcdir)/t/instspc.tap \
 +  $(wildcard $(srcdir)/t/depcomp-*.tap) \
 +  $(wildcard $(srcdir)/t/*libtool*.sh) \
 +  $(wildcard $(srcdir)/t/lt*.sh) \
 +  $(wildcard $(srcdir)/t/remake*.sh)
 +
 +TESTS = \
 +  $(long_running_TESTS) \
 +  $(filter-out $(long_running_TESTS), $(all_TESTS))
 +
 +EXTRA_DIST += $(TESTS)
 +
 +# FIXME: this "expected failures" are in truth an hack used to
 +# FIXME: to verify that some incorrect usages of our perl libraries
 +# FIXME: raise an error.  We should find a cleaner way to check that.
 +perl_fake_XFAIL_TESTS = \
 +  t/pm/Cond2.pl \
 +  t/pm/Cond3.pl \
 +  t/pm/DisjCon2.pl \
 +  t/pm/DisjCon3.pl \
 +  t/pm/Version2.pl \
 +  t/pm/Version3.pl
 +
 +XFAIL_TESTS = \
 +  t/all.sh \
 +  t/yacc-bison-skeleton-cxx.sh \
 +  t/yacc-bison-skeleton.sh \
 +  t/cond17.sh \
 +  t/gcj6.sh \
 +  t/override-conditional-2.sh \
 +  t/dist-pr109765.sh \
 +  t/instdir-cond2.sh \
 +  t/interp3.sh \
 +  t/java-nobase.sh \
 +  t/objext-pr10128.sh \
 +  t/parallel-tests-many.sh \
 +  t/pr8365-remake-timing.sh \
 +  t/remake-am-pr10111.sh \
 +  t/remake-m4-pr10111.sh \
 +  t/txinfo5.sh \
 +  $(perl_fake_XFAIL_TESTS)
  
  # Some testsuite-influential variables should be overridable from the
  # test scripts, but not from the environment.

diff --cc automake.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc defs
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc m4/init.m4
Simple merge

diff --cc t/self-check-dir.tap
Simple merge