Merge branch 'master' into ng/master

* master:
  cosmetics: remove trailing whitespace in some files
  coverage: enhance tests in 'missing' script a little
  coverage: tests AM_MISSING_PROG usage
  docs: document AM_MISSING_PROG
  tests: fix a spurious failure with Solaris make
  tests: simpler workaround for shells losing the exit status in exit trap
  tests: avoid several spurious failures on Solaris
  tests: avoid a spurious failure on NetBSD

+ Extra non-trivial edits:
* Several tests: Adjusted to use 'exit' rather than 'Exit'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/t/README b/t/README
index dd8d0eec7..bf0fdc86e 100644
--- a/t/README
+++ b/t/README
@@ -198,7 +198,7 @@ Writing test cases
   changes the test by adding a failing command after the last command,
   the test will spuriously fail because '$?' is nonzero at the end.
   Note that this is relevant even if the errexit shell flag is on, in
-  case the test contains commands like "grep ... Makefile.in && Exit 1"
+  case the test contains commands like "grep ... Makefile.in && exit 1"
   (and there are indeed a lot of such tests).
 
 * Use $ACLOCAL, $AUTOMAKE, $AUTOCONF, $AUTOUPDATE, $AUTOHEADER,
@@ -215,9 +215,6 @@ Writing test cases
   likely to fail, display its output even in the failure case, before
   exiting.
 
-* Use 'Exit' rather than 'exit' to abort for leave early from a test
-  case.
-
 * Use '$PATH_SEPARATOR', not hard-coded ':', as the separator of
   PATH's entries.
 
@@ -282,7 +279,7 @@ Writing test cases
   generated configure scripts do not ensure they will find a truly POSIX
   shell (even though they will prefer and use it *if* it's found).
 
-* Do not test an Automake error with "$AUTOMAKE && Exit 1", or in three
+* Do not test an Automake error with "$AUTOMAKE && exit 1", or in three
   years we'll discover that this test failed for some other bogus reason.
   This happened many times.  Better use something like