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

diff --git a/test/Makefile b/test/Makefile
index 71cd04e..4cc9211 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,12 +1,14 @@
-# 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
+
+PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html	
+PHANTOMJS_TIMEOUT=12	
+
 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	
+PHANTOMJS=	./bomb.pl ./node_modules/phantomjs/bin/phantomjs
 IMAGES=	./images
 SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
 
@@ -24,7 +26,6 @@ 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
 
 test: check