X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=7e38ebcfe957fee0221e75e8f0e9fabfacbfa3f5;hb=1f5c585dc8b31ded6fd7b05ccce32fbdaab1105d;hp=b1e02f95b987f5e626d089bc8629beb3be97a143;hpb=ec99fc09061e9941f4d7ef54c8dfc2299c127a2d;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index b1e02f9..7e38ebc 100644 --- a/test/Makefile +++ b/test/Makefile @@ -5,12 +5,12 @@ 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 +PHANTOMJS_TIMEOUT= 12 all: check clean: - rm -f mkws-error.png + rm -f mkws-error.png mkws-error.html distclean: clean rm -rf node_modules @@ -32,7 +32,7 @@ phantomjs: ${PHANTOMJS} phantom/evaluate.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT} jsbeautifier jsb indent: - for i in ./spec*/*.js ./js/*.js; do \ + for i in ./spec*/*.js ./js/*.js ./phantom/*.js; do \ jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \ done