travis: add zsh 4/5 to matrix

[zsh-autoenv.git] / Makefile

diff --git a/Makefile b/Makefile
index 7b1b23fab3c4cdae71a5264b5f3c7ee0e02bebef..ed90a571ed796dcf1896aca58255c9975516bbc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
-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:
        cram --shell=zsh -v tests
@@ -8,11 +12,13 @@ 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; \
+               ZDOTDIR=${CURDIR}/$$i cram --shell=zsh -v tests || ret=$$?; \
                echo; \
-       done
+       done; \
+       return $$ret
 
 # Define targets for test files, with relative and abolute path.
 # Use verbose output, which is useful with Vim's 'errorformat'.
@@ -21,7 +27,10 @@ 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):
-       ZDOTDIR="${CURDIR}/tests" cram --shell=zsh -v $@
+       cram --shell=zsh -v $@
 .PHONY: $(_TESTS_REL_AND_ABS)
 
 .PHONY: itest test
+
+clean:
+       $(RM) tests/*.err