From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 28 Jun 2011 09:26:15 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1109e2f9164e850dea0fea1f009d3265e51e5c8;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  Revert "docs: parallel-tests is not experimental anymore"
  parallel-tests: stricter checks on DISABLE_HARD_ERRORS support
  docs: parallel-tests is not experimental anymore
  check: document and test $(TEST_SUITE_LOG) overriding
---

b1109e2f9164e850dea0fea1f009d3265e51e5c8
diff --cc ChangeLog
index 3cff620e8,af1c66db9..8ae87193c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -353,6 -305,6 +353,15 @@@
  	($AUTORECONF): New variable, defaulting to `@am_AUTORECONF@'.
  	* doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update.
  
++2011-05-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
++	parallel-tests: stricter checks on DISABLE_HARD_ERRORS support
++	* tests/parallel-tests-harderror.test: New test, doing more
++	in-depth checks on DISABLE_HARD_ERRORS.
++	* tests/parallel-tests.test: Remove tests on DISABLE_HARD_ERRORS,
++	now redundant.
++	* tests/Makefile.am (TESTS): Update.
++
  2011-05-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  	    Stefano Lattarini  <stefano.lattarini@gmail.com>
  
@@@ -431,13 -386,17 +440,24 @@@
  	when cross compiling.
  	(gfortran, g77, non-cross): New requirements.
  
 +2011-05-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	tests: fix portability issues in 'repeated-options.test'
 +	* tests/repeated-options.test: Do not assume that object files
 +	have `.o' suffix and executables have no default suffix; instead,
 +	use `$(OBJEXT)' and `$(EXEEXT)'.
 +
+ 2011-05-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	check: document and test $(TEST_SUITE_LOG) overriding
+ 	* doc/automake.texi (Simple Tests using parallel-tests): Explain
+ 	how and why TEST_SUITE_LOG can be overridden at runtime.
+ 	* tests/parallel-tests-log-override-1.test: New test, check that
+ 	the newly documented idiom and similar usages are truly supported.
+ 	* tests/parallel-tests-log-override-2.test: Likewise.
+ 	* tests/parallel-tests-log-override-recheck.test: Likewise.
+ 	* tests/Makefile.am (TESTS): Update.
+ 
  2011-05-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	tests: fix spurious failure of txinfo21.test on FreeBSD
diff --cc tests/Makefile.am
index ab8ce79e6,4f78e9a1b..3883dc009
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -718,11 -594,12 +718,15 @@@ parallel-tests7.test 
  parallel-tests8.test \
  parallel-tests9.test \
  parallel-tests10.test \
 -parallel-tests-harderror.test \
 +parallel-tests-am_tests_environment.test \
  parallel-tests-unreadable-log.test \
  parallel-tests-subdir.test \
 +parallel-tests-interrupt.test \
 +parallel-tests-reset-term.test \
++parallel-tests-harderror.test \
+ parallel-tests-log-override-1.test \
+ parallel-tests-log-override-2.test \
+ parallel-tests-log-override-recheck.test \
  parse.test \
  percent.test \
  percent2.test \
diff --cc tests/Makefile.in
index a4457253c,a6ff6f541..74538637b
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -991,11 -871,12 +991,15 @@@ parallel-tests7.test 
  parallel-tests8.test \
  parallel-tests9.test \
  parallel-tests10.test \
 -parallel-tests-harderror.test \
 +parallel-tests-am_tests_environment.test \
  parallel-tests-unreadable-log.test \
  parallel-tests-subdir.test \
 +parallel-tests-interrupt.test \
 +parallel-tests-reset-term.test \
++parallel-tests-harderror.test \
+ parallel-tests-log-override-1.test \
+ parallel-tests-log-override-2.test \
+ parallel-tests-log-override-recheck.test \
  parse.test \
  percent.test \
  percent2.test \