nagachika	2016-03-31 05:04:31 +0900 (Thu, 31 Mar 2016)

  New Revision: 54442

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54442

  Log:
    merge revision(s) 53227: [Backport #11852]
    
    * test/ruby/test_io.rb: handled rlimit value same as r52277
      [Bug #11852][ruby-dev:49446]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/ruby/test_io.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54441)
+++ ruby_2_2/ChangeLog	(revision 54442)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Mar 31 04:49:05 2016  Kimura Wataru  <kimuraw@i...>
+
+	* test/ruby/test_io.rb: handled rlimit value same as r52277
+	  [Bug #11852][ruby-dev:49446]
+
 Wed Mar 30 06:37:56 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* tool/extlibs.rb (do_patch): let "patch" command change the
Index: ruby_2_2/test/ruby/test_io.rb
===================================================================
--- ruby_2_2/test/ruby/test_io.rb	(revision 54441)
+++ ruby_2_2/test/ruby/test_io.rb	(revision 54442)
@@ -1066,7 +1066,10 @@ class TestIO < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_io.rb#L1066
     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)
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54441)
+++ ruby_2_2/version.h	(revision 54442)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
-#define RUBY_RELEASE_DATE "2016-03-30"
-#define RUBY_PATCHLEVEL 290
+#define RUBY_RELEASE_DATE "2016-03-31"
+#define RUBY_PATCHLEVEL 291
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_DAY 31
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53227


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/