minor: sync lib/varstash

[zsh-autoenv.git] / Makefile

diff --git a/Makefile b/Makefile
index 0c7b2e9fca1ec2755eebfa7955efb2549e748a36..b9ea8967e0604381b3a755e4dc36f09f08cd0767 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,29 @@
-export ZDOTDIR=${CURDIR}/tests/ZDOTDIR
+# Default, can be overridden using "make test ZDOTDIR=...".
+ZDOTDIR:=${CURDIR}/tests/ZDOTDIR
+
+# Export it, and make it absolute.
+override export ZDOTDIR:=$(abspath $(ZDOTDIR))
+
+TEST_SHELL:=zsh
 
 test:
-       cram --shell=zsh -v tests
+       cram --shell=$(TEST_SHELL) -v tests
 
 itest:
-       cram -i --shell=zsh tests
+       cram -i --shell=$(TEST_SHELL) tests
 
 # Run tests with all ZDOTDIRs.
 test_full:
-       for i in $(wildcard tests/ZDOTDIR*); do \
-               echo "ZDOTDIR=$$i"; \
-               ZDOTDIR=${CURDIR}/$$i cram --shell=zsh -v tests; \
-               echo; \
-       done
+       for zsh in zsh /opt/zsh-4.3.9/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; \
+       exit $$ret
 
 # Define targets for test files, with relative and abolute path.
 # Use verbose output, which is useful with Vim's 'errorformat'.
@@ -21,7 +32,7 @@ TESTS:=$(wildcard tests/*.t)
 uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 _TESTS_REL_AND_ABS:=$(call uniq,$(abspath $(TESTS)) $(TESTS))
 $(_TESTS_REL_AND_ABS):
-       cram --shell=zsh -v $@
+       cram --shell=$(TEST_SHELL) -v $@
 .PHONY: $(_TESTS_REL_AND_ABS)
 
 .PHONY: itest test