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

diff --git a/test/Makefile b/test/Makefile
index 02652dc..33c5fb3 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,6 +2,7 @@
 
 # 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
 
@@ -10,11 +11,12 @@ 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
 
@@ -22,13 +24,13 @@ 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
 
 help:
 	@echo "make [ all | check | clean | distclean ]"