From dba3498944ff5533d8a5273e8317c8af779d6fdf Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 9 Sep 2014 02:14:01 +0000
Subject: [PATCH] * test/ruby/test_object.rb: extend timeout.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 4 ++++
 test/ruby/test_object.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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;