nuke ./spec-sp - phantomjs does a much better job

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

diff --git a/test/Makefile b/test/Makefile
index a6c0865..ee50534 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,9 +1,11 @@
-# Copyright (c) 2013 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 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
-PHANTOMJS=     ./node_modules/phantomjs/bin/phantomjs
+JASMINE_NODE=  ./node_modules/jasmine-node/bin/jasmine-node
+PHANTOMJS=     ./bomb.pl ./node_modules/phantomjs/bin/phantomjs
 PHANTOMJS_URL= https://mkws-dev.indexdata.com/jasmine-popup.html       
 PHANTOMJS_TIMEOUT=     12      
 IMAGES=        ./images
@@ -22,8 +24,7 @@ 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
 
 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: