X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2FMakefile;h=b1e02f95b987f5e626d089bc8629beb3be97a143;hb=ec99fc09061e9941f4d7ef54c8dfc2299c127a2d;hp=c1c74e90a60aafb020fb4ca86423c4b7471023f1;hpb=173bbc2175cd06ca030201ef2eb7b5a206d5cb08;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index c1c74e9..b1e02f9 100644 --- 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 +PHANTOMJS_URL= https://mkws-dev.indexdata.com/jasmine-popup.html +PHANTOMJS_TIMEOUT= 8 all: check @@ -27,8 +29,7 @@ terse: $(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 \