summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-17 22:05:22 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-17 22:05:22 +0000
commit11548f925390fc72d04be5276bc1fe77f99ddd02 (patch)
treeda323524712d1a2d18dfdd4b5237b8abc429cd43
parent338cea741dc57ad58921d989c9dfa7bed3f2ac9c (diff)
test/-ext-/string/test_modify_expand.rb: increase limit for {je,tc}malloc
In this test, jemalloc and tcmalloc are both more hesitant to release memory to the kernel than the stock glibc allocator. Tested on jemalloc 3.6.0 (self-built) and libtcmalloc-minimal 2.0-2 (Debian package) on x86_64-linux git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/-ext-/string/test_modify_expand.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e0f5d5c861..0557a5a896 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 18 07:03:36 2014 Eric Wong <e@80x24.org>
+
+ * test/-ext-/string/test_modify_expand.rb: increase limit
+ for {je,tc}malloc [Bug #10236]
+
Thu Sep 18 06:41:18 2014 Eric Wong <e@80x24.org>
* ext/zlib/zlib.c (struct gzfile): pack (288 => 272 bytes) on 64-bit
diff --git a/test/-ext-/string/test_modify_expand.rb b/test/-ext-/string/test_modify_expand.rb
index 6a18560bd4..1d20db4e6c 100644
--- a/test/-ext-/string/test_modify_expand.rb
+++ b/test/-ext-/string/test_modify_expand.rb
@@ -4,7 +4,8 @@ require_relative '../../ruby/envutil'
class Test_StringModifyExpand < Test::Unit::TestCase
def test_modify_expand_memory_leak
- assert_no_memory_leak(["-r-test-/string/string"], <<-PRE, <<-CMD, "rb_str_modify_expand()")
+ assert_no_memory_leak(["-r-test-/string/string"],
+ <<-PRE, <<-CMD, "rb_str_modify_expand()", limit: 2.5)
s=Bug::String.new
PRE
size = $initial_size