X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=e2d8fc23bada8531b7751f505f8654579e4c7be9;hb=20013b13f5947f4b24103156f73e02da85a3c129;hp=8f90995436381e4cad767b1974027009a29189e4;hpb=5f3c59b359014191f559876942483d6351b2ec84;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 8f90995..e2d8fc2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,18 +1,37 @@
 # 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:
+clean:
+
+distclean:
+	rm -rf node_modules
+
+mkws-complete-syntax-check:
+	${MAKE} -C../tools/htdocs $@
 
-check:
-	jasmine-node ./spec 
+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 \
 	  jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
 	done
 
+node-modules: node_modules
+node_modules:
+	npm install ${NPM_INSTALL_FLAGS} jQuery xmlhttprequest jsdom request jasmine-node
+
 help:
-	@echo "make [ all | clean | check | jsbeautifier ]"
+	@echo "make [ all | check | clean | distclean ]"
+	@echo "     [ jsbeautifier | node-modules ]"