merge revision(s) 53227: [Backport ruby#11852]

unak · unak · commit ee1a685178e5 · 2016-03-30T09:45:39.000Z
* test/ruby/test_io.rb: handled rlimit value same as r52277 [Bug ruby#11852][ruby-dev:49446] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 30 18:45:26 2016  Kimura Wataru  <kimuraw@i.nifty.jp>
+
+	* test/ruby/test_io.rb: handled rlimit value same as r52277
+	  [Bug #11852][ruby-dev:49446]
+
 Tue Mar 29 21:10:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
 	* ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
@@ -1067,7 +1067,10 @@ def ruby(*args)
     args = ['-e', '$>.write($<.read)'] if args.empty?
     ruby = EnvUtil.rubybin
     opts = {}
-    opts[:rlimit_nproc] = 1024 if defined?(Process::RLIMIT_NPROC)
+    if defined?(Process::RLIMIT_NPROC)
+      lim = Process.getrlimit(Process::RLIMIT_NPROC)[1]
+      opts[:rlimit_nproc] = [lim, 1024].min
+    end
     f = IO.popen([ruby] + args, 'r+', opts)
     pid = f.pid
     yield(f)
diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.1.9"
-#define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 489
+#define RUBY_RELEASE_DATE "2016-03-30"
+#define RUBY_PATCHLEVEL 490
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 30
 
 #include "ruby/version.h"
 
