From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 27 Jun 2014 14:47:12 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into MKWS-229
X-Git-Tag: 1.0.0~458^2~4^2~1
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=a6302cae8f48c3448a63b6cbd0d1ccab12232e2d;hp=b00013fe39e1d0299c8760c14cc7900e35e2e56b

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
--- 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
--- 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";