Merge branch 'maint'

* maint:
  tests: automatic re-execution works for non-POSIX shells too
  tests: use more POSIX shell features our test scripts

+ Extra non-trivial edits:

* t/ax/test-init.sh: Apply the diffs between past versions of
'defs' in maint and in master; i.e., remove handling of $required
entries 'texi2dvi-o' and 'makeinfo-html', and adjust to the fact
that the parallel testsuite harness is now the default.

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

1 files changed, 5 insertions, 8 deletions

diff --git a/t/ext.sh b/t/ext.sh
index 08643ac26..2124310e4 100755
--- a/t/ext.sh
+++ b/t/ext.sh
@@ -34,13 +34,10 @@ END
 $ACLOCAL
 $AUTOMAKE
 
-for ext in f for f90 f95 F F90 F95 r m mm upc
-do
-   # Some versions of the BSD shell wrongly exit when 'set -e' is active
-   # if the last command within a compound statement fails and is guarded
-   # by an && only.  So we play safe and use the following idiom, instead
-   # of the apparently simpler 'grep ... && Exit 1'.
-   if grep "^$ext\.o:" Makefile.in; then Exit 1; else :; fi
+for ext in f for f90 f95 F F90 F95 r m mm upc; do
    grep "^\.$ext\.o:" Makefile.in
+   grep "^$ext\.o:" Makefile.in && Exit 1
+   : For shells with busted 'set -e'.
 done
-Exit 0
+
+: