projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2f105e
)
enable to set PHANTOMJS_TIMEOUT as env variable, not just a make variable
author
Wolfram Schneider
<wosch@indexdata.dk>
Fri, 28 Nov 2014 13:21:24 +0000
(13:21 +0000)
committer
Wolfram Schneider
<wosch@indexdata.dk>
Fri, 28 Nov 2014 13:21:24 +0000
(13:21 +0000)
test/Makefile
patch
|
blob
|
history
diff --git
a/test/Makefile
b/test/Makefile
index
e3fa61a
..
c4cb346
100644
(file)
--- 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