Merge branch 'master' into test-protocols

* master:
  test defs: more environment cleanup

diff --cc ChangeLog
index 232230d,a8a6711..f7b195f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,37 -1,11 +1,43 @@@
  2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       test defs: more environment cleanup
+       * tests/defs: Also unset variables AM_COLOR_TESTS and
+       AM_TESTS_ENVIRONMENT.
+ 
+ 2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
 +      test harness: more minor VPATH-rewrite issues
 +      * tests/am/check.am (am__set_TESTS_bases, $(TEST_SUITE_LOGS),
 +      am--redo-logs, recheck, recheck-html): Cosmetic fixlets to
 +      minimize the risk of unwanted VPATH rewrites.
 +      (check-TESTS): Likewise, and normalize trailing whitespace
 +      since we are at it.
 +      Bugs exposed by test cases `check6-p.test' and `check7-p.test'.
 +
 +2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      test harness: "make -n check" works correctly with Solaris make
 +      To avoid some recipes being executed with "make -n", we used the
 +      trick of issuing recursive make calls not directly with $(MAKE),
 +      but with a simple indirection instead:
 +        ...
 +        am__stealth_MAKE = $(MAKE)
 +        ...
 +        target:
 +            ... $(am__stealth_MAKE) ...
 +        ...
 +      This hack worked with GNU make, but, unfortunately, not with
 +      Solaris make.  The present change removes the hack, and uses more
 +      proper idioms to avoid unwanted recipe executions with "make -n".
 +      Bug exposed by test case `parallel-tests-dry-run.test'.
 +      * lib/am/check.am (am__stealth_MAKE): Remove, no more used.
 +      (.log.trs): Break recipe in multiple shell invocations.
 +      ($(TEST_SUITE_LOG)): Likewise, and move some corner-case parts of
 +      the recipe to ...
 +      (am--redo-logs): ... this new internal helper .PHONY target.
 +
 +2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
        tests: fix spurious failure with Solaris make
        * tests/distcheck-configure-flags-am.test: Avoid using `+=' too
        liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks

diff --cc tests/defs
Simple merge