From 1872f299e2aaa3c7fd74f59b12dcc63fadda272e Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 10 Sep 2014 02:49:27 +0000 Subject: merge revision(s) 47362: [Backport #9984] * test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak): added timeout into testcase for low performance environment. [Bug #9984][ruby-core:63367] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/envutil.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index f27c15afb0..c330850e5c 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -340,7 +340,7 @@ eom assert_warning(*args) {$VERBOSE = false; yield} end - def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.52, rss: false) + def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.52, rss: false, timeout: 10) require_relative 'memory_status' token = "\e[7;1m#{$$.to_s}:#{Time.now.strftime('%s.%L')}:#{rand(0x10000).to_s(16)}:\e[m" token_dump = token.dump @@ -359,7 +359,7 @@ eom code, 'GC.start', ].join("\n") - _, err, status = EnvUtil.invoke_ruby(args, cmd, true, true) + _, err, status = EnvUtil.invoke_ruby(args, cmd, true, true, timeout: timeout) before = err.sub!(/^#{token_re}START=(\{.*\})\n/, '') && Memory::Status.parse($1) after = err.sub!(/^#{token_re}FINAL=(\{.*\})\n/, '') && Memory::Status.parse($1) assert_equal([true, ""], [status.success?, err], message) -- cgit v1.2.3