From b05c95d93f39b95c6c743282ce4d9e674453f12f Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 24 Apr 2012 01:56:35 +0000 Subject: * 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 --- test/drb/drbtest.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test') 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 -- cgit v1.2.3