summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_process.rb6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 65ea7ead6..779665ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 31 16:15:13 2006 Tanaka Akira <akr@fsij.org>
+
+ * test/ruby/test_process.rb (TestProcess#test_rlimit_nofile):
+ setrlimit may fail with EINVAL.
+ reported by MIYAMUKO Katsuyuki. [ruby-dev:29174]
+
Mon Jul 31 09:22:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.h: use ifdef (or defined) for macro constants that may or
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index dc04c60f4..93eb871ed 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