indent

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

diff --git a/test/Makefile b/test/Makefile
index d4106a5..33c5fb3 100644 (file)
--- 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
 
@@ -14,10 +15,8 @@ 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
+       jasmine-node --noColor --captureExceptions --forceexit ./spec
+       jasmine-node --noColor --captureExceptions --forceexit ./spec-sp
 
 test: check
 
@@ -25,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 ]"