Merge branch 'master' into testsuite-work

* master:
  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

diff --cc ChangeLog
index 3c79637c7d2fe18021b4acdcc72dbfea4d4cae5a,8ae87193c7316a82e3cddf9e34c757ba75e75beb..525654b5ce8f81c8f1ad7e643ec0facba0103ebc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1460,17 -447,17 +1469,28 @@@
        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 extradep.test on FreeBSD
 +      * tests/extradep.test: When using `ls -t' to determine whether a
 +      file has been updated, make sure to use as reference a file whose
 +      timestamp is expected to be *strictly* older that that of the file
 +      being checked.  This is required because at least FreeBSD `ls' do
 +      not sort files with the same timestamp in alphabetical order when
 +      using the `-t' option.
 +      * tests/extradep2.test: Likewise.
 +
  2011-05-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: fix spurious failure of txinfo21.test on FreeBSD

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/parallel-tests.test
Simple merge