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, 4 insertions, 4 deletions

diff --git a/t/libtool7.sh b/t/libtool7.sh
index 11e43432d..e6b1025e3 100755
--- a/t/libtool7.sh
+++ b/t/libtool7.sh
@@ -18,7 +18,7 @@
 # Also check basic support for AM_LIBTOOLFLAGS/LIBTOOLFLAGS
 
 required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
@@ -80,7 +80,7 @@ $AUTOMAKE --add-missing --copy
 ./configure "--prefix=$(pwd)/_inst"
 env LIBTOOLFLAGS=--silent $MAKE print >output 2>&1 || {
   cat output
-  Exit 1
+  exit 1
 }
 cat output
 grep '1BEG: libmod1.la mod2.la :END1' output
@@ -91,7 +91,7 @@ $MAKE
 
 env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1 || {
   cat output
-  Exit 1
+  exit 1
 }
 cat output
 grep 'silent.*silent.*prg' output
@@ -99,7 +99,7 @@ grep 'silent.*silent.*libmod1' output
 
 env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1 || {
   cat output
-  Exit 1
+  exit 1
 }
 cat output
 grep 'silent.*silent.*libmod1' output