From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 28 Nov 2014 13:21:24 +0000 (+0000)
Subject: enable to set PHANTOMJS_TIMEOUT as env variable, not just a make variable
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=0b8db87910e02328db600f653e8a4421a94bc3aa;p=mkws-moved-to-github.git

enable to set PHANTOMJS_TIMEOUT as env variable, not just a make variable
---

diff --git a/test/Makefile b/test/Makefile
index e3fa61a..c4cb346 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,7 +8,7 @@ APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
 #PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html
 PHANTOMJS_PATH=jasmine-local-popup.html
 PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
-PHANTOMJS_TIMEOUT=30
+PHANTOMJS_TIMEOUT ?= 30
 
 NPM_INSTALL_FLAGS=-q
 JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node