summaryrefslogtreecommitdiff
path: root/test/rinda
diff options
context:
space:
mode:
authorshirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-25 15:36:30 +0000
committershirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-25 15:36:30 +0000
commite9c8509e87dccb22640cf09f3c72f59180429789 (patch)
tree9623c44cac7c1479edc6de466556de2ff9442545 /test/rinda
parent5e9dc52be520c976bcba1c5932a2ef9e567972eb (diff)
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
Diffstat (limited to 'test/rinda')
-rw-r--r--test/rinda/test_rinda.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 946af979882..577eb1a7e51 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?