Merge branch 'test-protocols' into tap-testsuite-work

* test-protocols:
  test harness: recursive make invocations must use $(AM_MAKEFLAGS)

diff --cc ChangeLog
index fdc2614,0be0272..d91bc59
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,60 -1,20 +1,68 @@@
  2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 -      tests: fix various blunders in 'suffix-chain.test'
 -      * tests/suffix-chain.test: Fix various blunders that were causing
 -      this test to fail spuriously: append to `configure.in', not to
 -      `configure.ac'; add a `;' character after the `return' statement
 -      in an input file; use tabs, not spaces, to indent Makefile recipes;
 -      and use more uncommon suffixes that don't trigger built-in recipes
 -      with FreeBSD make.
+       test harness: recursive make invocations must use $(AM_MAKEFLAGS)
+       * lib/am/check.am ($(TEST_SUITE_LOG)): Pass $(AM_MAKEFLAGS)
+       to $(MAKE) when issuing a recursive make call.
+       Problem detected by the `sc_tests_make_without_am_makeflags'
+       maintainer check.
+ 
+ 2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
 +      tests: fix spurious failure in 'suffix-chain.tap'
 +      * tests/suffix-chain.test: Use more uncommon suffixes that
 +      don't trigger built-in recipes with FreeBSD make.
 +
 +2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: improvements to our shell TAP library and APIs
 +      These improvements impact only the Automake's own testsuite.
 +      * tests/tap-functions.sh (plan_): Allow new special arguments
 +      "unknown" a.k.a. "later" and "lazy" a.k.a. "now".  Perform
 +      sanity check the given arguments.  Adjust incorrect comments.
 +      (lazy_plan_): Removed, superseded by the new version of `plan_'.
 +      (not): New function, run a command and inverts its exit status.
 +      (ok_, not_ok_, skip_): These are just shorthands for common
 +      `result_' usages.
 +      (xfail_, xpass_, reset_test_count_): Removed, they are not used,
 +      nor does a legitimate use for them seem in sight.
 +      (not): New function, to run a command inverting its exit status.
 +      (command_not_ok_): Removed, superseded by `command_ok_' + `not'.
 +      (command_ok_): Extended to accept TAP directives.
 +      * tests/defs (trap): Don't use `late_plan_' anymore, use
 +      `plan_ "now"' instead.
 +      * tests/ac-output-old.tap: Update to take advantage of the new
 +      APIs.
 +      * tests/self-check-env-sanitize.tap: Likewise.
 +      * tests/suffix-chain.tap: Likewise.
 +      * tests/suffix10.tap: Likewise.
 +      * tests/suffix11.tap: Likewise.
 +      * tests/suffix3.tap: Likewise.
 +      * tests/suffix8.tap: Likewise.
 +      * tests/tap-bad-prog.tap: Likewise.
 +      * tests/self-check-exit.tap: Likewise, plus a small improvement
 +      in the name of a variable.
 +
 +2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: convert some `suffix*' tests to TAP
 +      This will allow us to explicitly declare some expected failures
 +      involving Solaris make as such, instead of partly papering over
 +      them with skips and partly letting them fail too loudly.
 +      * tests/suffix-chain.test: Rename ...
 +      * tests/suffix-chain.tap: ... to this, and convert to the use of
 +      TAP.  Also, fix some bugs since we are at it, and ...
 +      ($required): ... require `cc'.
 +      * tests/suffix3.test: Rename ...
 +      * tests/suffix3.tap: ... to this, and convert to the use of TAP.
 +      Also, since we are at it, throw in some formatting fixes.
 +      * tests/suffix8.test: Rename ...
 +      * tests/suffix8.tap: ... to this, and convert to the use of TAP.
 +      Also, since we are at it, throw in some formatting fixes.
 +      * tests/suffix10.test: Rename ...
 +      * tests/suffix10.tap: ... to this, and convert to the use of TAP.
 +      * tests/suffix11.test: Rename ...
 +      * tests/suffix11.tap: ... to this, and convert to the use of TAP.
 +      * tests/Makefile.am (TESTS): Update.
  
  2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
  

diff --cc lib/Automake/tests/Makefile.in
Simple merge

diff --cc tests/Makefile.in
Simple merge