X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=cecb5fc20052539b256626e7774baacaf951eb39;hb=d2481365789565539ddf25550910ddb9be29c701;hp=51595770d16f46936439700d07f9cc7018aa4521;hpb=d41fee94aa9622b55710c32bdf996168ac5a5625;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 5159577..cecb5fc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,11 +4,13 @@
 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
 
 clean:
-	rm -f mkws-error.png
+	rm -f mkws-error.png mkws-error.html
 
 distclean: clean
 	rm -rf node_modules
@@ -17,6 +19,7 @@ mkws-complete-syntax-check:
 	${MAKE} -C../tools/htdocs $@
 
 check: mkws-complete-syntax-check
+	@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi 
 	jasmine-node --noColor --captureExceptions --forceexit ./spec
 	jasmine-node --noColor --captureExceptions --forceexit ./spec-sp
 
@@ -26,11 +29,10 @@ 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 \
+	for i in ./spec*/*.js ./js/*.js ./phantom/*.js; do \
 	  jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
 	done