nagachika	2013-02-27 00:22:53 +0900 (Wed, 27 Feb 2013)

  New Revision: 39513

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39513

  Log:
    merge revision(s) 39179,39245: [Backport #7826]
    
    the process maybe already finished
    * test/ruby/test_process.rb (test_setsid): Added a workaround for
      MacOS X. Patch by nagachika. [Bug #7826] [ruby-core:52126]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/ruby/test_process.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39512)
+++ ruby_2_0_0/ChangeLog	(revision 39513)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Feb 27 00:20:43 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* test/ruby/test_process.rb (test_setsid): Added a workaround for
+	  MacOS X. Patch by nagachika. [Bug #7826] [ruby-core:52126]
+
 Sun Feb 24 15:16:00 2013  Eric Hodel  <drbrain@s...>
 
 	* lib/net/http.rb:  Removed duplicate Accept-Encoding in Net::HTTP#get.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39512)
+++ ruby_2_0_0/version.h	(revision 39513)
@@ -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-02-26"
-#define RUBY_PATCHLEVEL 1
+#define RUBY_RELEASE_DATE "2013-02-27"
+#define RUBY_PATCHLEVEL 2
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/ruby/test_process.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_process.rb	(revision 39512)
+++ ruby_2_0_0/test/ruby/test_process.rb	(revision 39513)
@@ -1583,6 +1583,9 @@ class TestProcess < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_process.rb#L1583
 	newsid = Process.setsid
 	Marshal.dump(newsid, STDOUT)
 	STDOUT.flush
+	# getsid() on MacOS X return ESRCH when target process is zombie
+	# even if it is valid process id.
+	sleep
 EOS
       begin
         # test Process.getsid() w/o arg
@@ -1591,7 +1594,7 @@ EOS https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_process.rb#L1594
         # test Process.setsid return value and Process::getsid(pid)
         assert_equal(Marshal.load(io), Process.getsid(io.pid))
       ensure
-        Process.kill(:KILL, io.pid)
+        Process.kill(:KILL, io.pid) rescue nil
         Process.wait(io.pid)
       end
     end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39179,39245


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/