Merge branch 'master' into ng/master

* master:
  tests: prepare to move ./defs to t/ax/test-init.sh

diff --cc Makefile.am
Simple merge

diff --cc t/README
index ee063b44c443dfca703206b0fdc34197e41b698d,02cb3a5a9d8cd9c43d99ce987cad0b7dc1f82524..b4e1490c731f09a79e6a5ee9fc390ef396c066eb
--- 1/t/README
--- 2/t/README
+++ b/t/README
@@@ -166,25 -162,26 +166,26 @@@ Writing test case
    parallel one.  For those tests that are *not* meant to work with the
    parallel testsuite harness at all (these should be very very few),
    set the shell variable 'am_serial_tests' to "yes" before including
-   ./defs.
+   test-init.sh.
  
 -* Some tests in the Automake testsuite are auto-generated; those tests
 -  might have custom extensions, but their basename (that is, with such
 -  extension stripped) is expected to end with "-w" string, optionally
 -  followed by decimal digits.  For example, the name of a valid
 -  auto-generated test can be 'color-w.sh' or 'tap-signal-w09.tap'.
 +* Some tests in the Automake-NG testsuite are auto-generated; those
 +  tests might have custom extensions, but their basename (that is,
 +  with such extension stripped) is expected to end with "-w" string,
 +  optionally followed by decimal digits.  For example, the name of a
 +  valid auto-generated test can be 'color-w.sh' or 'tap-signal-w09.tap'.
    Please don't name hand-written tests in a way that could cause them
 -  to be confused with auto-generated tests; for example, 'u-v-w.sh'
 -  or 'option-w0.tap' are *not* valid name for hand-written tests.
 +  to be confused with auto-generated tests; for example, 'u-v-w.sh' or
 +  'option-w0.tap' are *not* valid name for hand-written tests.
  
- * ./defs brings in some commonly required files, and sets a skeleton
-   configure.ac.  If possible, append to this file.  In some cases
-   you'll have to overwrite it, but this should be the exception.  Note
-   that configure.ac registers Makefile.in but do not output anything by
+ * test-init.sh brings in some commonly required files, and sets a skeleton
+   configure.ac.  If possible, append to this file.  In some cases you'll
+   have to overwrite it, but this should be the exception.  Note that
+   configure.ac registers Makefile.in but do not output anything by
    default.  If you need ./configure to create Makefile, append AC_OUTPUT
-   to configure.ac.  In case you don't want ./defs to pre-populate your
-   test directory (which is a rare occurrence), set the 'am_create_testdir'
-   shell variable to "empty" before sourcing ./defs.
+   to configure.ac.  In case you don't want your test directory to be
+   pre-populate by test-init.sh (this should be a rare occurrence), set
+   the 'am_create_testdir' shell variable to "empty" before sourcing
+   test-init.sh.
  
  * By default, the testcases are run with the errexit shell flag on,
    to make it easier to catch failures you might not have thought of.