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

diff --git a/test/Makefile b/test/Makefile
index c47ab00..09f3555 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,29 +1,36 @@
 # Copyright (c) 2013 IndexData ApS. http://indexdata.com
 
+# 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
+
 all: check
 
 clean:
 
 distclean:
 	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
+	jasmine-node --noColor --captureExceptions --forceexit ./spec
+	jasmine-node --noColor --captureExceptions --forceexit ./spec-sp
 
 test: check
 
+terse:
+	$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
+
 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 ]"