From 76e387c7663e2e49af9298c3b81f839612562601 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 15 Dec 2017 23:11:20 +0100 Subject: [PATCH] Travis: actually use different ZDOTDIRs (#83) --- .travis.yml | 2 +- Makefile | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d45fe56..9836688 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,4 +18,4 @@ install: - export SHELL=zsh script: - zsh --version - - make test + - make test ZDOTDIR=$ZDOTDIR diff --git a/Makefile b/Makefile index b9ea896..a217a6b 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,15 @@ # Default, can be overridden using "make test ZDOTDIR=...". ZDOTDIR:=${CURDIR}/tests/ZDOTDIR - -# Export it, and make it absolute. -override export ZDOTDIR:=$(abspath $(ZDOTDIR)) +# Make it absolute. +override ZDOTDIR:=$(abspath $(ZDOTDIR)) TEST_SHELL:=zsh test: - cram --shell=$(TEST_SHELL) -v tests + ZDOTDIR=$(ZDOTDIR) cram --shell=$(TEST_SHELL) -v tests itest: - cram -i --shell=$(TEST_SHELL) tests + ZDOTDIR=$(ZDOTDIR) cram -i --shell=$(TEST_SHELL) tests # Run tests with all ZDOTDIRs. test_full: -- 2.44.0