summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_process.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c9300f672..1fd7de173b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 16 12:01:29 2014 Koichi Sasada <ko1@atdot.net>
+
+ * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+ extend timeout seconds to 60 for RGENGC_CHECK_MODE > 0 environment.
+
Tue Dec 16 08:53:12 2014 Eric Wong <e@80x24.org>
* tool/vcs.rb: fix Ruby 1.8 compatibility harder
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 28c0ac5940..f1fd2c25dc 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1924,7 +1924,7 @@ EOS
end
def test_deadlock_by_signal_at_forking
- assert_separately([], <<-INPUT)
+ assert_separately([], <<-INPUT, timeout: 60)
require 'io/wait'
begin
GC.start # reduce garbage