From 10fafb6c4bcc912074e15ce937b3fbbe329a65be Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 31 Jul 2006 07:18:43 +0000 Subject: * test/ruby/test_process.rb (TestProcess#test_rlimit_nofile): setrlimit may fail with EINVAL. reported by MIYAMUKO Katsuyuki. [ruby-dev:29174] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_process.rb | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2ca4d6e166..48e988b74e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 31 16:15:13 2006 Tanaka Akira + + * test/ruby/test_process.rb (TestProcess#test_rlimit_nofile): + setrlimit may fail with EINVAL. + reported by MIYAMUKO Katsuyuki. [ruby-dev:29174] + Mon Jul 31 13:38:22 2006 GOTOU Yuuzou * lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index dc04c60f40..93eb871edc 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -23,7 +23,11 @@ class TestProcess < Test::Unit::TestCase return unless rlimit_exist? pid = fork { cur_nofile, max_nofile = Process.getrlimit(Process::RLIMIT_NOFILE) - Process.setrlimit(Process::RLIMIT_NOFILE, 0, max_nofile) + begin + Process.setrlimit(Process::RLIMIT_NOFILE, 0, max_nofile) + rescue Errno::EINVAL + exit 0 + end begin IO.pipe rescue Errno::EMFILE -- cgit v1.2.3