projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
677cc73
)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
author
Wolfram Schneider
<wosch@indexdata.dk>
Thu, 3 Jul 2014 10:47:35 +0000
(10:47 +0000)
committer
Wolfram Schneider
<wosch@indexdata.dk>
Thu, 3 Jul 2014 10:47:35 +0000
(10:47 +0000)
test/Makefile
patch
|
blob
|
history
diff --git
a/test/Makefile
b/test/Makefile
index
e808d55
..
2d58b7f
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-6,7
+6,8
@@
MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
#PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html
-PHANTOMJS_URL=http://localhost:${APACHE_PORT}/jasmine-local-popup.html
+PHANTOMJS_PATH=jasmine-local-popup.html
+PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
PHANTOMJS_TIMEOUT=16
NPM_INSTALL_FLAGS=-q