diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/drb/drbtest.rb | 6 |
2 files changed, 9 insertions, 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 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 |