run full syntax check before running tests

[mkws-moved-to-github.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 8891679..d4106a5 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,18 +1,29 @@
 # 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
+
 all: check
 
 clean:
 
 distclean:
        rm -rf node_modules
-       
 
-check:
-       jasmine-node --captureExceptions ./spec 
+mkws-complete-syntax-check:
+       ${MAKE} -C../tools/htdocs $@
+
+check: mkws-complete-syntax-check
+       for i in ./spec/*.js; do \
+         echo "$$i"; \
+         jasmine-node --noColor --captureExceptions --forceexit $$i; \
+       done
 
 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; \
@@ -20,7 +31,8 @@ jsbeautifier jsb indent:
 
 node-modules: node_modules
 node_modules:
-       npm install jquery jsdom request jasmine-node
+       npm install jQuery xmlhttprequest jsdom request jasmine-node
 
 help:
-       @echo "make [ all | clean | check | jsbeautifier | node-modules ]"
+       @echo "make [ all | check | clean | distclean ]"
+       @echo "     [ jsbeautifier | node-modules ]"