ruby-changes:23400
From: usa <ko1@a...>
Date: Tue, 24 Apr 2012 10:56:46 +0900 (JST)
Subject: [ruby-changes:23400] usa:r35451 (trunk): * test/drb/drbtest.rb ({DRbCore,DRbAry}#teardown}: cannot pass SIGTERM
usa 2012-04-24 10:56:35 +0900 (Tue, 24 Apr 2012) New Revision: 35451 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35451 Log: * test/drb/drbtest.rb ({DRbCore,DRbAry}#teardown}: cannot pass SIGTERM to another process on Windows, so use SIGINT instead. Modified files: trunk/ChangeLog trunk/test/drb/drbtest.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 35450) +++ ChangeLog (revision 35451) @@ -1,3 +1,8 @@ +Tue Apr 24 10:54:34 2012 NAKAMURA Usaku <usa@r...> + + * 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@t...> * thread.c (rb_check_deadlock): refine an error message of deadlock Index: test/drb/drbtest.rb =================================================================== --- test/drb/drbtest.rb (revision 35450) +++ test/drb/drbtest.rb (revision 35451) @@ -73,10 +73,11 @@ 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 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/