projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configurable test URL
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
c1c74e9
..
b1e02f9
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-4,6
+4,8
@@
MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
NPM_INSTALL_FLAGS=-q
PHANTOMJS= ./node_modules/phantomjs/bin/phantomjs
MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
NPM_INSTALL_FLAGS=-q
PHANTOMJS= ./node_modules/phantomjs/bin/phantomjs
+PHANTOMJS_URL= https://mkws-dev.indexdata.com/jasmine-popup.html
+PHANTOMJS_TIMEOUT= 8
all: check
all: check
@@
-27,8
+29,7
@@
terse:
$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
phantomjs:
$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
phantomjs:
- @# ${PHANTOMJS} phantom/evaluate.js https://mkws-dev.indexdata.com/jasmine-local-popup.html
- ${PHANTOMJS} phantom/evaluate.js https://mkws-dev.indexdata.com/jasmine-popup.html
+ ${PHANTOMJS} phantom/evaluate.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
jsbeautifier jsb indent:
for i in ./spec*/*.js ./js/*.js; do \
jsbeautifier jsb indent:
for i in ./spec*/*.js ./js/*.js; do \