aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--test/ruby/test_object.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8abf880bce..6941141022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 9 11:11:05 2014 Koichi Sasada <ko1@atdot.net>
+
+ * test/ruby/test_object.rb: extend timeout.
+
Tue Sep 9 09:02:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index e79913ead0..585795ba38 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -814,7 +814,7 @@ class TestObject < Test::Unit::TestCase
def test_copied_ivar_memory_leak
bug10191 = '[ruby-core:64700] [Bug #10191]'
- assert_no_memory_leak([], <<-"end;", <<-"end;", bug10191, rss: true)
+ assert_no_memory_leak([], <<-"end;", <<-"end;", bug10191, rss: true, timeout: 60)
def (a = Object.new).set; @v = nil; end
num = 500_000
end;