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>

3 files changed, 4 insertions, 4 deletions

diff --git a/t/perf/cond.sh b/t/perf/cond.sh
index 7c8261e26..cf9c76081 100755
--- a/t/perf/cond.sh
+++ b/t/perf/cond.sh
@@ -17,7 +17,7 @@
 # Check that many conditions do not lead to combinatorial explosion.
 # (This is related to PR/352.)
 
-. ./defs || Exit 1
+. ./defs || exit 1
 
 echo AC_PROG_CC >>configure.ac
 
diff --git a/t/perf/testsuite-recheck.sh b/t/perf/testsuite-recheck.sh
index 6fd793b02..e3383beda 100755
--- a/t/perf/testsuite-recheck.sh
+++ b/t/perf/testsuite-recheck.sh
@@ -19,7 +19,7 @@
 # FIXME: performance is too low, and FAIL accordingly; it just offers an
 # FIXME: easy way to verify how effective a performance optimization is.
 
-. ./defs || Exit 1
+. ./defs || exit 1
 
 count=5000
 
diff --git a/t/perf/testsuite-summary.sh b/t/perf/testsuite-summary.sh
index 04408ee76..296a62102 100755
--- a/t/perf/testsuite-summary.sh
+++ b/t/perf/testsuite-summary.sh
@@ -20,7 +20,7 @@
 # FIXME: performance is too low, and FAIL accordingly; it just offers
 # FIXME: an easy way verify how effective a performance optimization is.
 
-. ./defs || Exit 1
+. ./defs || exit 1
 
 count=10000
 
@@ -63,7 +63,7 @@ $AUTOMAKE -a
 
 ./configure
 
-$MAKE test-suite.log >stdout || { cat stdout; Exit 1; }
+$MAKE test-suite.log >stdout || { cat stdout; exit 1; }
 cat stdout
 
 # Sanity checks.