naruse	2012-05-19 14:42:43 +0900 (Sat, 19 May 2012)

  New Revision: 35717

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

  Log:
    merge revision(s) 35451:
    
    * test/drb/drbtest.rb ({DRbCore,DRbAry}#teardown}: cannot pass SIGTERM
      to another process on Windows, so use SIGINT instead.

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

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35716)
+++ ruby_1_9_3/ChangeLog	(revision 35717)
@@ -1,3 +1,8 @@
+Sat May 19 14:42:37 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/drb/drbtest.rb ({DRbCore,DRbAry}#teardown}: cannot pass SIGTERM
+	  to another process on Windows, so use SIGINT instead.
+
 Sat May 19 14:42:20 2012  Tanaka Akira  <akr@f...>
 
 	* lib/drb/ssl.rb: generate 1024 bits RSA key instead of 512 bits.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35716)
+++ ruby_1_9_3/version.h	(revision 35717)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 222
+#define RUBY_PATCHLEVEL 223
 
 #define RUBY_RELEASE_DATE "2012-05-19"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/drb/drbtest.rb
===================================================================
--- ruby_1_9_3/test/drb/drbtest.rb	(revision 35716)
+++ ruby_1_9_3/test/drb/drbtest.rb	(revision 35717)
@@ -73,10 +73,11 @@
   def teardown
     @ext.stop_service if defined?(@ext) && @ext
     DRbService.manager.unregist(@service_name)
+    signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :INT : :TERM
     Thread.list.each {|th|
       if th.respond_to?(:pid) && th[:drb_service] == @service_name
         begin
-          Process.kill :TERM, th.pid
+          Process.kill signal, th.pid
         rescue Errno::ESRCH
         end
         th.join
@@ -290,10 +291,11 @@
   def teardown
     @ext.stop_service if defined?(@ext) && @ext
     DRbService.manager.unregist(@service_name)
+    signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :INT : :TERM
     Thread.list.each {|th|
       if th.respond_to?(:pid) && th[:drb_service] == @service_name
         begin
-          Process.kill :TERM, th.pid
+          Process.kill signal, th.pid
         rescue Errno::ESRCH
         end
         th.join

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