diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-19 05:42:43 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-19 05:42:43 +0000 |
| commit | 5d43f34a369b2ef579fcf9f8f5824eff4737053b (patch) | |
| tree | ccd9573d49de1653ae366211f459c82ce9b97fbf /test | |
| parent | e050fc1bb7f397a84deadd68bdbbc405df8cca3a (diff) | |
merge revision(s) 35451:
* 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/branches/ruby_1_9_3@35717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/drb/drbtest.rb | 6 |
1 files changed, 4 insertions, 2 deletions
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 |