./bomb.pl will use the slightly larger timeout as the node.js script (was fixed 100...

diff --git a/test/Makefile b/test/Makefile
index 7e77b0b..a1f9dc9 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,11 +4,11 @@
 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   
+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=     ./node_modules/phantomjs/bin/phantomjs
 IMAGES=        ./images
 SCREENSHOT_WIDTH=      360 480 640 768 1024 1200 1440 2048
 
@@ -33,7 +33,7 @@ terse:
        $(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
 phantomjs p:
-       ${PHANTOMJS} phantom/evaluate.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+       ./bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/evaluate.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
 screenshot:
        ${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000

diff --git a/test/bomb.pl b/test/bomb.pl
index d78d2cc..f4b4cec 100755 (executable)
--- a/test/bomb.pl
+++ b/test/bomb.pl
@@ -57,7 +57,7 @@ EOF
 GetOptions(
     "help"      => \$help,
     "debug=i"   => \$debug,
-    "timeout=i" => \$timeout,
+    "timeout=f" => \$timeout,
 ) or die usage;
 
 my @system = @ARGV;