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

diff --git a/test/Makefile b/test/Makefile
index 7d91522..57b5c46 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -50,7 +50,7 @@ phantomjs p: apache-stop apache-start _phantomjs
        ${MAKE} apache-stop
 
 _phantomjs:
-       ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+       perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
 mike-test:
        $(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html

diff --git a/test/bin/bomb.pl b/test/bin/bomb.pl
index bff7f68..a79be99 100755 (executable)
--- a/test/bin/bomb.pl
+++ b/test/bin/bomb.pl
@@ -41,8 +41,8 @@ die usage if !@system;
 # set CPU limit, in case the alarm handler will
 # be ignored
 eval {
-    require BSD::Resource2;
-    setrlimit("RLIMIT_CPU", $timeout, 2*$timeout) or die "Cannot set CPU limit: $!\n";
+    require BSD::Resource;
+    BSD::Resource::setrlimit("RLIMIT_CPU", $timeout, 2*$timeout) or die "Cannot set CPU limit: $!\n";
 };
 if ($@) {
     warn "Please install the package BSD::Resource!\n\n$@\n";