Merge branch 'maint'

* maint:
  tests: simpler workaround for shells losing the exit status in exit trap

+ 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, 8 insertions, 8 deletions

diff --git a/t/missing3.sh b/t/missing3.sh
index e8641da18..3a9ba013f 100755
--- a/t/missing3.sh
+++ b/t/missing3.sh
@@ -17,7 +17,7 @@
 # Test missing when running a tool's --version.
 
 am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
 
 get_shell_script missing
 
@@ -31,18 +31,18 @@ run_cmd ()
   return $st
 }
 
-./missing b7cb8259 --version && Exit 1
-grep WARNING stderr && Exit 1
-run_cmd ./missing b7cb8259 --grep && Exit 1
+./missing b7cb8259 --version && exit 1
+grep WARNING stderr && exit 1
+run_cmd ./missing b7cb8259 --grep && exit 1
 grep 'WARNING:.*missing on your system' stderr
 
 # missing itself it known to exist :)
 
-run_cmd ./missing ./missing --version || Exit 1
+run_cmd ./missing ./missing --version || exit 1
 grep 'missing .*(GNU [aA]utomake)' stdout
-test -s stderr && Exit 1
-run_cmd ./missing ./missing --grep && Exit 1
-grep WARNING stderr && Exit 1
+test -s stderr && exit 1
+run_cmd ./missing ./missing --grep && exit 1
+grep WARNING stderr && exit 1
 grep "missing:.* unknown '--grep'" stderr
 
 :