X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=c1c74e90a60aafb020fb4ca86423c4b7471023f1;hb=173bbc2175cd06ca030201ef2eb7b5a206d5cb08;hp=02652dc2d960158a8886471110f304e2515cefe6;hpb=78f7f34bb1aae2abaf7762ef49f939b3aa5ee0d9;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 02652dc..c1c74e9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,34 +2,43 @@
 
 # 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
 
-check:
-	for i in ./spec/*.js; do \
-	  echo "$$i"; \
-	  jasmine-node --noColor --captureExceptions --forceexit $$i; \
-	done
+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
 
 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 \
+	for i in ./spec*/*.js ./js/*.js; do \
 	  jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
 	done
 
 node-modules: node_modules
 node_modules:
-	npm install jQuery xmlhttprequest jsdom request jasmine-node
+	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 ]"