1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* test/ruby/test_io.rb: handled rlimit value same as r52277
	  [Bug #11852][ruby-dev:49446]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-03-30 09:45:39 +00:00
parent 289889a654
commit ee1a685178
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

5
test/ruby/test_io.rb
View File

@ -1067,7 +1067,10 @@ class TestIO < Test::Unit::TestCase
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)

6
version.h
View File

@ -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"