From 5d3a3ee01cb70dcbbb1206073db1ec6cab5e591b Mon Sep 17 00:00:00 2001 From: Shrikant Sharat Date: Fri, 7 Mar 2014 10:57:24 +0530 Subject: [PATCH] Fix no virtualenv on travis. --- .travis.yml | 2 +- Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a462064..e1032a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,4 +32,4 @@ install: - "sudo apt-get install zsh" # Run the tests. -script: "make tests" +script: "make tests PYENV=" diff --git a/Makefile b/Makefile index 13ac11a..342d213 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,10 @@ .PHONY: itests tests +PYENV ?= . .pyenv/bin/activate && TESTS ?= tests itests: ${MAKE} tests CRAM_OPTS=-i tests: - . .pyenv/bin/activate && ZDOTDIR="${PWD}/tests" cram ${CRAM_OPTS} --shell=zsh ${TESTS} + ${PYENV} ZDOTDIR="${PWD}/tests" cram ${CRAM_OPTS} --shell=zsh ${TESTS} -- 2.0.0