Merge branch 'simplify-exit-trap-workaround' into maint

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

+ Extra non-trivial edits:

* t/am-missing-prog.sh: Use 'exit, not 'Exit'.

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

1 files changed, 3 insertions, 5 deletions

diff --git a/gen-testsuite-part b/gen-testsuite-part
index 34e10a83d..002136263 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -86,12 +86,10 @@ sub line_match ($$)
 sub write_wrapper_script ($$$)
 {
   my ($file_handle, $wrapped_test, $shell_setup_code, $creator_name) = @_;
-  # FIXME: we use some creative quoting in the generated scripts,
-  # FIXME: to please maintainer-check.
   print $file_handle unindent <<EOF;
     #! /bin/sh
     # This file has been automatically generated.  DO NOT EDIT BY HAND!
-    . ./defs-static || exit '99';
+    . ./defs-static || exit 1
     $shell_setup_code
     # In the spirit of VPATH, we prefer a test in the build tree
     # over one in the source tree.
@@ -102,7 +100,7 @@ sub write_wrapper_script ($$$)
       fi
     done
     echo "\$0: cannot find wrapped test '$wrapped_test'" >&2
-    exit '99'
+    exit 99
 EOF
 }
 
@@ -358,7 +356,7 @@ foreach my $lt (TRUE, FALSE)
               # Automatically generated test.  DO NOT EDIT BY HAND!
               @vars_init
               required="@required"
-              . ./defs || Exit 1
+              . ./defs || exit 1
               plan_ $planned
               . "\$am_testauxdir/depcomp.sh"; exit "\$?"
 EOF