nagachika	2013-07-20 23:52:28 +0900 (Sat, 20 Jul 2013)

  New Revision: 42090

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

  Log:
    merge revision(s) 40232: [Backport #8251]
    
    * test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill
      if it fails with Errno::EPERM on Windows (workaround).
      [ruby-dev:47245] [Bug #8251]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/drb/drbtest.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42089)
+++ ruby_2_0_0/ChangeLog	(revision 42090)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Jul 20 23:49:33 2013  NAKAMURA Usaku  <usa@r...>
+
+	* test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill
+	  if it fails with Errno::EPERM on Windows (workaround).
+	  [ruby-dev:47245] [Bug #8251]
+
 Sat Jul 20 23:31:11 2013  Aman Gupta  <tmm1@r...>
 
 	* iseq.c (iseq_location_setup): re-use existing string when iseq has
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42089)
+++ ruby_2_0_0/version.h	(revision 42090)
@@ -1,6 +1,6 @@ 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-07-20"
-#define RUBY_PATCHLEVEL 272
+#define RUBY_PATCHLEVEL 273
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7
Index: ruby_2_0_0/test/drb/drbtest.rb
===================================================================
--- ruby_2_0_0/test/drb/drbtest.rb	(revision 42089)
+++ ruby_2_0_0/test/drb/drbtest.rb	(revision 42090)
@@ -79,9 +79,16 @@ module DRbCore https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/drb/drbtest.rb#L79
     signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
     Thread.list.each {|th|
       if th.respond_to?(:pid) && th[:drb_service] == @service_name
-        begin
-          Process.kill signal, th.pid
-        rescue Errno::ESRCH
+        10.times do
+          begin
+            Process.kill signal, th.pid
+            break
+          rescue Errno::ESRCH
+            break
+          rescue Errno::EPERM # on Windows
+            sleep 0.1
+            retry
+          end
         end
         th.join
       end
@@ -300,9 +307,16 @@ module DRbAry https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/drb/drbtest.rb#L307
     signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
     Thread.list.each {|th|
       if th.respond_to?(:pid) && th[:drb_service] == @service_name
-        begin
-          Process.kill signal, th.pid
-        rescue Errno::ESRCH
+        10.times do
+          begin
+            Process.kill signal, th.pid
+            break
+          rescue Errno::ESRCH
+            break
+          rescue Errno::EPERM # on Windows
+            sleep 0.1
+            retry
+          end
         end
         th.join
       end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40232


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