X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=003bcac825f94e91b8617cf36a8c040ced9fc019;hb=8fce278d9a8d7ced8c2c46a1c7eec3b5bfd4ad8c;hp=4beff13e2befe4eeeb4f23582683740317b156f0;hpb=059b544941a19eb4e7cacf08d2a3a6d9740f92e9;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 4beff13..003bcac 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,11 +3,12 @@
 # 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=16
+
 NPM_INSTALL_FLAGS=-q
 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	
+PHANTOMJS=	./node_modules/phantomjs/bin/phantomjs
 IMAGES=	./images
 SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
 
@@ -25,15 +26,14 @@ 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
 
 terse:
 	$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
-phantomjs:
-	${PHANTOMJS} phantom/evaluate.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+phantomjs p:
+	./bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
 screenshot:
 	${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000
@@ -63,5 +63,5 @@ help:
 	@echo "     [ phantomjs | screenshot ]"
 	@echo "     [ jsbeautifier | node-modules ]"
 	@echo ""
-	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOM_URL=https://mkws-dev.indexdata.com/jasmine-popup.html"
+	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html"