aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--test/drb/drbtest.rb4
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 12cc173fef..b6b90a2f47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Sep 29 19:41:11 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+
+ * test/drb/drbtest.rb (DRbCore#teardown):
+ Use Process.kill :KILL on Windows because Process.kill :INT silently
+ fails on Windows 7 and raises EINVAL on Windows XP for spawned
+ process with new_pgroup: false.
+
+ * test/drb/drbtest.rb (DRbAry#teardown): ditto.
+
Sat Sep 29 19:40:32 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* test/ruby/test_unicode_escape.rb (TestUnicodeEscape#test_basic):
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index cb553eee59..ac0f5c6be9 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -76,7 +76,7 @@ module DRbCore
while (@there&&@there.to_s rescue nil)
# nop
end
- signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :INT : :TERM
+ signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
Thread.list.each {|th|
if th.respond_to?(:pid) && th[:drb_service] == @service_name
begin
@@ -297,7 +297,7 @@ module DRbAry
while (@there&&@there.to_s rescue nil)
# nop
end
- signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :INT : :TERM
+ signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
Thread.list.each {|th|
if th.respond_to?(:pid) && th[:drb_service] == @service_name
begin