mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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/trunk@35451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
28a8188e4d
commit
b05c95d93f
2 changed files with 9 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
Tue Apr 24 10:54:34 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.
|
||||
|
||||
Tue Apr 24 00:25:39 2012 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* thread.c (rb_check_deadlock): refine an error message of deadlock
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue