From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 16 May 2012 14:10:06 +0000 (+0200)
Subject: self tests: cater for /bin/ksh symlinked to Zsh
X-Git-Tag: v1.12.0b~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9006f81c15d6e7901e9c4d5fd78ab284f66355a;p=thirdparty%2Fautomake.git

self tests: cater for /bin/ksh symlinked to Zsh

* t/self-check-reexec.tap: When searching for a suitable non-Bash
shells, be sure to reject any shell that is Zsh "in disguise" (as
can be found on some Debian systems, where /bin/ksh can be symlinked
to /bin/zsh4).  This is required because our testsuite does not
support older versions of Zsh, and that was causing the test to fail
in the setup just described.

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

diff --git a/t/self-check-reexec.tap b/t/self-check-reexec.tap
index 7b91008ec..e19a6814b 100755
--- a/t/self-check-reexec.tap
+++ b/t/self-check-reexec.tap
@@ -48,7 +48,12 @@ for non_bash_shell in \
 do
   test "$non_bash_shell" = : && break
   $non_bash_shell -c 'exit 0' || continue
-  $non_bash_shell -c 'test -n "$BASH_VERSION"' && continue
+  # Be sure to reject also any shell that is Zsh "in disguise" (as can
+  # be found on some Debian systems, where /bin/ksh can be symlinked to
+  # /bin/zsh4).  This is required because our testsuite does not support
+  # older versions of Zsh, and that has caused spurious failures in the
+  # past.
+  $non_bash_shell -c 'test -n "$ZSH_VERSION$BASH_VERSION"' && continue
   break
 done