From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 11 Aug 2011 09:28:03 +0000 (+0200)
Subject: Merge branch 'master' into test-protocols
X-Git-Tag: ng-0.5a~89^2~101^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7cbc8a792ee1a33ab1cedd1d89237487b2c6782;p=thirdparty%2Fautomake.git

Merge branch 'master' into test-protocols

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

a7cbc8a792ee1a33ab1cedd1d89237487b2c6782
diff --cc ChangeLog
index 0be0272a3,2d7e5d6ea..0c5c5e7ae
--- a/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 6f2e91ad6,833dc7a26..bac1d328d
--- a/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 0d2bbf8fe,ede80e6eb..1688557a6
--- a/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 \