X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=71cd04e5eeb424608c52ca3da81201b3c3370910;hb=329840de4815ae08900c31f9e5ff1e3a85c6e6a9;hp=a6c0865056e50e9b97eb9c3e5aa1169844b9d2ea;hpb=61946b4f14280cedb456ce97311f845eae2e8b6c;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index a6c0865..71cd04e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,6 +3,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
+JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node
 PHANTOMJS=	./node_modules/phantomjs/bin/phantomjs
 PHANTOMJS_URL=	https://mkws-dev.indexdata.com/jasmine-popup.html	
 PHANTOMJS_TIMEOUT=	12	
@@ -22,8 +23,8 @@ mkws-complete-syntax-check:
 
 check: mkws-complete-syntax-check
 	@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi 
-	jasmine-node --noColor --captureExceptions --forceexit ./spec
-	jasmine-node --noColor --captureExceptions --forceexit ./spec-sp
+	${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
+	${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec-sp
 
 test: check
 
@@ -53,8 +54,7 @@ jsbeautifier jsb indent:
 	  jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
 	done
 
-node-modules: node_modules
-node_modules:
+node_modules node-modules:
 	npm install ${NPM_INSTALL_FLAGS}
 
 help: