make test_full: use zsh 4 (/opt/zsh4/bin/zsh) and zsh 5

diff --git a/Makefile b/Makefile
index ed90a571ed796dcf1896aca58255c9975516bbc6..b43d7097990801d24614fc827a80f1c7f958ac42 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,11 +12,14 @@ itest:
 
 # Run tests with all ZDOTDIRs.
 test_full:
-       ret=0; \
-       for i in $(wildcard tests/ZDOTDIR*); do \
-               echo "ZDOTDIR=$$i"; \
-               ZDOTDIR=${CURDIR}/$$i cram --shell=zsh -v tests || ret=$$?; \
-               echo; \
+       for zsh in zsh /opt/zsh4/bin/zsh; do \
+               command -v $$zsh || { echo "Skipping non-existing shell: $$zsh"; continue; }; \
+               ret=0; \
+               for i in $(wildcard tests/ZDOTDIR*); do \
+                       echo "zsh=$zsh ZDOTDIR=$$i"; \
+                       SHELL=$$zsh ZDOTDIR=${CURDIR}/$$i cram --shell=zsh -v tests || ret=$$?; \
+                       echo; \
+               done; \
        done; \
        return $$ret