summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-02 03:43:25 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-02 03:43:25 +0000
commit8d50ddda39e157c3037f8893454dc31f507e9f2e (patch)
treed878eed5252d56504c49c53fb944e7195b05a9ee
parentcf85c2efdcb01eef33086f2e8cf0cbf6ac0c4328 (diff)
test/ruby/test_io.rb (test_select_leak): extend timeout for Arch Linux[Backport 14929]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64613 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_io.rb2
-rw-r--r--version.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 308656ceac..1590e180ab 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -3744,7 +3744,7 @@ __END__
end if Socket.const_defined?(:MSG_OOB)
def test_select_leak
- assert_no_memory_leak([], <<-"end;", <<-"end;", rss: true, timeout: 120)
+ assert_no_memory_leak([], <<-"end;", <<-"end;", rss: true, timeout: 240)
r, w = IO.pipe
rset = [r]
wset = [w]
diff --git a/version.h b/version.h
index 2a758bd661..9d0ff2d780 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.5.2"
-#define RUBY_RELEASE_DATE "2018-09-01"
-#define RUBY_PATCHLEVEL 86
+#define RUBY_RELEASE_DATE "2018-09-02"
+#define RUBY_PATCHLEVEL 87
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 2
#include "ruby/version.h"