ruby-changes:32103
From: nagachika <ko1@a...>
Date: Sat, 14 Dec 2013 00:33:21 +0900 (JST)
Subject: [ruby-changes:32103] nagachika:r44182 (ruby_2_0_0): merge revision(s) 41427:
nagachika 2013-12-14 00:33:11 +0900 (Sat, 14 Dec 2013) New Revision: 44182 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44182 Log: merge revision(s) 41427: test_pty.rb: reap zombie * test/test_pty.rb (test_cloexec): reap zombie than leaving to detaching thread. Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/test/test_pty.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 44181) +++ ruby_2_0_0/version.h (revision 44182) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #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" Index: ruby_2_0_0/test/test_pty.rb =================================================================== --- ruby_2_0_0/test/test_pty.rb (revision 44181) +++ ruby_2_0_0/test/test_pty.rb (revision 44182) @@ -211,6 +211,7 @@ class TestPTY < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/test_pty.rb#L211 PTY.spawn(RUBY, '-e', '') {|r, w, pid| assert(r.close_on_exec?) assert(w.close_on_exec?) + Process.wait(pid) } rescue RuntimeError skip $! Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r41427 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/