From 11fe8c971570e554c916c4085025909d9149346f Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 13 Dec 2013 15:33:11 +0000 Subject: [PATCH] merge revision(s) 41427: test_pty.rb: reap zombie * test/test_pty.rb (test_cloexec): reap zombie than leaving to detaching thread. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/test_pty.rb | 1 + version.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test_pty.rb b/test/test_pty.rb index 0b05c62477..b6ce684509 100644 --- a/test/test_pty.rb +++ b/test/test_pty.rb @@ -211,6 +211,7 @@ class TestPTY < Test::Unit::TestCase PTY.spawn(RUBY, '-e', '') {|r, w, pid| assert(r.close_on_exec?) assert(w.close_on_exec?) + Process.wait(pid) } rescue RuntimeError skip $! diff --git a/version.h b/version.h index d24062e449..25fd4ca495 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-12-13" -#define RUBY_PATCHLEVEL 358 +#define RUBY_RELEASE_DATE "2013-12-14" +#define RUBY_PATCHLEVEL 359 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #include "ruby/version.h"