diff options
-rw-r--r-- | test/ruby/test_process.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 93eb85ea08..b37fbfebd6 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -59,9 +59,11 @@ class TestProcess < Test::Unit::TestCase return unless rlimit_exist? with_tmpchdir { write_file 's', <<-"End" + # if limit=0, this test freeze pn OpenBSD + limit = /openbsd/ =~ RUBY_PLATFORM ? 1 : 0 result = 1 begin - Process.setrlimit(Process::RLIMIT_NOFILE, 0) + Process.setrlimit(Process::RLIMIT_NOFILE, limit) rescue Errno::EINVAL result = 0 end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 122 +#define RUBY_PATCHLEVEL 123 #define RUBY_RELEASE_DATE "2012-02-16" #define RUBY_RELEASE_YEAR 2012 |