check for single active client before clicking on a record

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

diff --git a/test/Makefile b/test/Makefile
index ee50534..dba1540 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,13 +3,15 @@
 # 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
+PERL_SCRIPTS=  bomb.pl
 
 all: check
 
@@ -31,8 +33,8 @@ 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
@@ -54,13 +56,19 @@ jsbeautifier jsb indent:
          jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
        done
 
+perltidy:
+       @ls ${PERL_SCRIPTS} | xargs -n1 -P16 perl -c 2>/dev/null
+       @ls ${PERL_SCRIPTS} | xargs -n2 -P8 perltidy -b
+
+
 node_modules node-modules:
        npm install ${NPM_INSTALL_FLAGS}
 
 help:
        @echo "make [ all | check | clean | distclean ]"
        @echo "     [ phantomjs | screenshot ]"
-       @echo "     [ jsbeautifier | node-modules ]"
+       @echo "     [ jsbeautifier | perltidy ]"
+       @echo "     [ 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"