merge revision(s) 35451:

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5dcaa26bb1..8e9eb2f593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 19 14:42:37 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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@fsij.org>
 
 	* lib/drb/ssl.rb: generate 1024 bits RSA key instead of 512 bits.
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 24c67f27ec..b9285b58ec 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -73,10 +73,11 @@ module DRbCore
   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 @@ module DRbAry
   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
diff --git a/version.h b/version.h
index da3480a64e..d5464a6a02 100644
--- a/version.h
+++ b/version.h
@@ -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