summaryrefslogtreecommitdiff
path: root/test/ruby
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-23 07:52:37 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-23 07:52:37 +0000
commit5222cc1eac378cf3a0799cb615c646a21eedaf21 (patch)
treeb2d880e9a50ff423e1738278fe153440d40f9291 /test/ruby
parent3c508c9d9b1fed041c0efae7d996056efdf2fd50 (diff)
merge revision(s) 45291,45299,45314,45325: [Backport #9599]
* ext/dl/cptr.c (dlptr_free), ext/dl/handle.c (dlhandle_free), ext/fiddle/handle.c (fiddle_handle_free), ext/fiddle/pointer.c (fiddle_ptr_free): fix memory leak. based on the patch Heesob Park at [ruby-dev:48021] [Bug #9599]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r--test/ruby/envutil.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index fc196f4b30..4efb0190f2 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: 2.0, rss: false)
+ def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.5, rss: false)
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