travis: cleanup, output zsh version

[zsh-autoenv.git] / Makefile

diff --git a/Makefile b/Makefile
index 0ffe150a521014dcf2cbfc706fd7fbdbd8736800..ed90a571ed796dcf1896aca58255c9975516bbc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,24 @@
-.PHONY: itest test
+# Default, can be overridden using "make test ZDOTDIR=...".
+ZDOTDIR:=${CURDIR}/tests/ZDOTDIR
+
+# Export it, and make it absolute.
+override export ZDOTDIR:=$(abspath $(ZDOTDIR))
 
 test:
-       ZDOTDIR="${PWD}/tests" cram --shell=zsh -v tests
+       cram --shell=zsh -v tests
 
 itest:
-       ZDOTDIR="${PWD}/tests" cram -i --shell=zsh tests
+       cram -i --shell=zsh tests
+
+# 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; \
+       done; \
+       return $$ret
 
 # Define targets for test files, with relative and abolute path.
 # Use verbose output, which is useful with Vim's 'errorformat'.
@@ -13,5 +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="${PWD}/tests" cram --shell=zsh -v $@
+       cram --shell=zsh -v $@
 .PHONY: $(_TESTS_REL_AND_ABS)
+
+.PHONY: itest test
+
+clean:
+       $(RM) tests/*.err