Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

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

diff --git a/test/Makefile b/test/Makefile
index ee50534..7e77b0b 100644 (file)
--- 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=12   
+
 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      
 IMAGES=        ./images
 SCREENSHOT_WIDTH=      360 480 640 768 1024 1200 1440 2048
 
@@ -31,7 +32,7 @@ test: check
 terse:
        $(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
-phantomjs:
+phantomjs p:
        ${PHANTOMJS} phantom/evaluate.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
 screenshot:
@@ -62,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"