From e9c8509e87dccb22640cf09f3c72f59180429789 Mon Sep 17 00:00:00 2001 From: shirosaki Date: Thu, 25 Apr 2013 15:36:30 +0000 Subject: [PATCH] test_rinda.rb: Use KILL on Windows * test/rinda/test_rinda.rb (TupleSpaceProxyTest#test_take_bug_8215): use KILL on Windows since TERM doen't work and ruby process remains after test-all on Windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/rinda/test_rinda.rb | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 641d2cd551..518df3e344 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 25 23:39:42 2013 Hiroshi Shirosaki + + * test/rinda/test_rinda.rb (TupleSpaceProxyTest#test_take_bug_8215): + use KILL on Windows since TERM doen't work and ruby process remains + after test-all on Windows. + Thu Apr 25 23:16:28 2013 Tanaka Akira * ext/curses/extconf.rb: Implement diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index 946af97988..577eb1a7e5 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -515,8 +515,9 @@ class TupleSpaceProxyTest < Test::Unit::TestCase assert_equal([[:test_take, 42]], @ts_base.read_all([:test_take, nil]), '[bug:8215] tuple lost') ensure - Process.kill("TERM", write) if write && status.nil? - Process.kill("TERM", take) if take + signal = /mswin|mingw/ =~ RUBY_PLATFORM ? "KILL" : "TERM" + Process.kill(signal, write) if write && status.nil? + Process.kill(signal, take) if take end def have_fork?