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

diff --git a/README b/README
index 55d911c..5696cd1 100644 (file)
--- a/README
+++ b/README
@@ -21,7 +21,7 @@ Required devel tools
 ====================
 
 On debian, you will need:
-$ sudo apt-get install curl git-core pandoc yui-compressor node-js
+$ sudo apt-get install curl git-core pandoc yui-compressor node-js libbsd-resource-perl
 
 On Debian 7 (wheezy), you do not need git-core, plain git will do, but
 you probably have that on a development box already. Unfortunately, node-js

diff --git a/test/bin/bomb.pl b/test/bin/bomb.pl
index 6211eab..9e0f06b 100755 (executable)
--- a/test/bin/bomb.pl
+++ b/test/bin/bomb.pl
@@ -6,6 +6,7 @@
 
 use Getopt::Long;
 use POSIX ":sys_wait_h";
+use BSD::Resource qw/setrlimit/;
 
 use strict;
 use warnings;
@@ -38,6 +39,10 @@ my @system = @ARGV;
 die usage if $help;
 die usage if !@system;
 
+# set CPU limit, in case the alarm handler will
+# be ignored
+setrlimit("RLIMIT_CPU", $timeout, 2*$timeout) or die "Cannot set CPU limit: $!\n";
+
 #
 # use fork/exec instead system()
 #
@@ -54,4 +59,3 @@ if ($pid) {
 else { }
 
 1;
-