summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-30 09:45:39 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-30 09:45:39 +0000
commitee1a685178e57213723559c544ac3ad8a61fe5c6 (patch)
treecb4f6e25ac2e08abed97dfc637de28fa34c24d8e
parent289889a654c25174faa7093ff8d3162e92f41806 (diff)
merge revision(s) 53227: [Backport #11852]
* 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
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_io.rb5
-rw-r--r--version.h6
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5964eaf..580615e 100644
--- 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
index 2283221..03a7faa 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -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)
diff --git a/version.h b/version.h
index 118fd18..4758592 100644
--- 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"