From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 24 Jun 2012 08:12:43 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.12b~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57f5a614203a2bc62b0640d2296ed3c9de12958f;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: fix automatic re-execution of tests with Zsh
  tests: drop support for older Zsh shells
  tests: allow AM_TEST_RUNNER_SHELL to be overridden
  tests: fix setup for older Zsh

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

57f5a614203a2bc62b0640d2296ed3c9de12958f
diff --cc defs
index d16758cb6,217665eaf..72dcf63f1
--- a/defs
+++ b/defs
@@@ -46,10 -46,10 +46,10 @@@ case ${AM_TESTS_REEXEC-yes} i
        *x*) opts=-x;;
        *) opts=;;
      esac
-     echo exec $AM_TEST_RUNNER_SHELL $opts "$0" "$*"
-     exec $AM_TEST_RUNNER_SHELL $opts "$0" ${1+"$@"}
+     echo exec $AM_TEST_RUNNER_SHELL $opts "$argv0" "$*"
+     exec $AM_TEST_RUNNER_SHELL $opts "$argv0" ${1+"$@"}
 -    # This should be dead code, unless some strange error happened. 
 +    # This should be dead code, unless some strange error happened.
-     echo "$0: failed to re-execute with $AM_TEST_RUNNER_SHELL" >&2
+     echo "$argv0: failed to re-execute with $AM_TEST_RUNNER_SHELL" >&2
      exit 99
      ;;
  esac