X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=c1c74e90a60aafb020fb4ca86423c4b7471023f1;hb=225e43b42f5c770d6996ac8039a516c2b2a95e04;hp=09f35550107df613f306148facc63a561db9c453;hpb=0ac96ac32ccbb24eb9ca37a3e4754e74535d1bc1;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 09f3555..c1c74e9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,18 +3,21 @@
 # For running on Mike's local install of node.js
 MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
 NPM_INSTALL_FLAGS=-q
+PHANTOMJS=	./node_modules/phantomjs/bin/phantomjs
 
 all: check
 
 clean:
+	rm -f mkws-error.png
 
-distclean:
+distclean: clean
 	rm -rf node_modules
 
 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
 
@@ -23,6 +26,10 @@ test: check
 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	
+
 jsbeautifier jsb indent:
 	for i in ./spec*/*.js ./js/*.js; do \
 	  jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
@@ -33,5 +40,5 @@ node_modules:
 	npm install ${NPM_INSTALL_FLAGS} jQuery xmlhttprequest jsdom request jasmine-node phantomjs
 
 help:
-	@echo "make [ all | check | clean | distclean ]"
+	@echo "make [ all | check | phantomjs | clean | distclean ]"
 	@echo "     [ jsbeautifier | node-modules ]"