diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/drb/drbtest.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -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 @@ -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 |