Merge branch 'master' into test-protocols

* master:
  coverage: possible infinite recursion in the test harness
  test defs: yet more environment cleanup

diff --cc ChangeLog
index 0be0272a3b436a9700df1d61c6e4bc674488c77f,2d7e5d6ea1b9244e26cbde1c59e243f3e5760f6a..0c5c5e7ae2fba6ce07136988666e682b91b3658c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,17 +1,25 @@@
+ 2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       coverage: possible infinite recursion in the test harness
+       Motivated by a regression in the 'test-protocols' branch.
+       * tests/parallel-tests-fork-bomb.test: New test, checking that
+       if $(TEST_SUITE_LOG) is in $(TEST_LOGS), we obtain a diagnosed
+       error rather than a make hang or a fork bomb.
+       * tests/Makefile.am (TESTS): Update.
+ 
+ 2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       test defs: yet more environment cleanup
+       * tests/defs: Also unset the TEST_SUITE_LOG variable.
+ 
 +2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      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 various blunders in 'suffix-chain.test'

diff --cc tests/Makefile.am
index 6f2e91ad6c721f0b9b692bc9a72b5dbfaf51897c,833dc7a26a7bf134582284c5446fc7986050fa05..bac1d328dee2b238d2d0ec4506ea8d51808e4cdf
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -736,43 -733,7 +736,44 @@@ parallel-tests-log-override-2.test 
  parallel-tests-log-override-recheck.test \
  parallel-tests-cmdline-override.test \
  parallel-tests-log-compiler-example.test \
+ parallel-tests-fork-bomb.test \
 +parallel-tests-empty-testlogs.test \
 +parallel-tests-driver-install.test \
 +parallel-tests-no-color-in-log.test \
 +parallel-tests-no-spurious-summary.test \
 +parallel-tests-exit-statuses.test \
 +parallel-tests-console-output.test \
 +parallel-tests-once.test \
 +tests-environment.test \
 +am-tests-environment.test \
 +tests-environment-backcompat.test \
 +testsuite-summary-color.test \
 +testsuite-summary-count.test \
 +testsuite-summary-count-many.test \
 +testsuite-summary-reference-log.test \
 +test-driver-custom-no-extra-driver.test \
 +test-driver-custom.test \
 +test-driver-custom-xfail-tests.test \
 +test-driver-custom-multitest.test \
 +test-driver-custom-multitest-recheck.test \
 +test-driver-custom-multitest-recheck2.test \
 +test-driver-custom-html.test \
 +test-driver-custom-no-html.test \
 +test-driver-create-log-dir.test \
 +test-driver-strip-vpath.test \
 +test-driver-trs-suffix-registered.test \
 +test-driver-fail.test \
 +test-harness-vpath-rewrite.test \
 +test-log.test \
 +test-metadata-global-log.test \
 +test-metadata-global-result.test \
 +test-metadata-recheck.test \
 +test-metadata-results.test \
 +test-missing.test \
 +test-missing2.test \
 +test-trs-basic.test \
 +test-trs-recover.test \
 +test-trs-recover2.test \
  parse.test \
  percent.test \
  percent2.test \

diff --cc tests/Makefile.in
index 0d2bbf8fe40c4b9814adfb74cdfb7f9d8a78fa86,ede80e6eba241929bc793a37a39cc46977a163a0..1688557a6065ad496156587fbd9903f035115bd8
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -994,43 -1006,7 +994,44 @@@ parallel-tests-log-override-2.test 
  parallel-tests-log-override-recheck.test \
  parallel-tests-cmdline-override.test \
  parallel-tests-log-compiler-example.test \
+ parallel-tests-fork-bomb.test \
 +parallel-tests-empty-testlogs.test \
 +parallel-tests-driver-install.test \
 +parallel-tests-no-color-in-log.test \
 +parallel-tests-no-spurious-summary.test \
 +parallel-tests-exit-statuses.test \
 +parallel-tests-console-output.test \
 +parallel-tests-once.test \
 +tests-environment.test \
 +am-tests-environment.test \
 +tests-environment-backcompat.test \
 +testsuite-summary-color.test \
 +testsuite-summary-count.test \
 +testsuite-summary-count-many.test \
 +testsuite-summary-reference-log.test \
 +test-driver-custom-no-extra-driver.test \
 +test-driver-custom.test \
 +test-driver-custom-xfail-tests.test \
 +test-driver-custom-multitest.test \
 +test-driver-custom-multitest-recheck.test \
 +test-driver-custom-multitest-recheck2.test \
 +test-driver-custom-html.test \
 +test-driver-custom-no-html.test \
 +test-driver-create-log-dir.test \
 +test-driver-strip-vpath.test \
 +test-driver-trs-suffix-registered.test \
 +test-driver-fail.test \
 +test-harness-vpath-rewrite.test \
 +test-log.test \
 +test-metadata-global-log.test \
 +test-metadata-global-result.test \
 +test-metadata-recheck.test \
 +test-metadata-results.test \
 +test-missing.test \
 +test-missing2.test \
 +test-trs-basic.test \
 +test-trs-recover.test \
 +test-trs-recover2.test \
  parse.test \
  percent.test \
  percent2.test \

diff --cc tests/defs
Simple merge