summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_process.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fa1b3e973..0858492b21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 16 08:58:11 2014 Eric Wong <[email protected]>
+
+ * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+ avoid killing wrong parent
+
Thu Oct 16 08:40:04 2014 Eric Wong <[email protected]>
* cont.c (fiber_store): restore references to next_fib (fix typo)
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 5aad1d52fb..b314b7f38a 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1925,8 +1925,9 @@ EOS
begin
$stderr.reopen($stdout)
trap(:QUIT) {}
+ parent = $$
100.times do |i|
- pid = fork {Process.kill(:QUIT, Process.ppid)}
+ pid = fork {Process.kill(:QUIT, parent)}
IO.popen(ruby, 'r+'){}
Process.wait(pid)
$stdout.puts