From 15bbf34c694d69475d27ba2e79d1ddaa15ff8e3e Mon Sep 17 00:00:00 2001 From: ko1 Date: Sun, 24 Nov 2013 19:01:14 +0000 Subject: [PATCH] * test/ruby/test_gc.rb: catch up last commit. Now RUBY_GC_OLDSPACE_LIMIT(...) is RUBY_GC_OLDMALLOC_LIMIT(...). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/test_gc.rb | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69645ff964..672977f8fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 25 03:59:45 2013 Koichi Sasada + + * test/ruby/test_gc.rb: catch up last commit. + Now RUBY_GC_OLDSPACE_LIMIT(...) is RUBY_GC_OLDMALLOC_LIMIT(...). + Mon Nov 25 03:10:46 2013 Koichi Sasada * gc.c: change terminology OLDSPACE -> OLDMALLOC. diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index 64ce408567..4ae34dc3b8 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -147,14 +147,14 @@ class TestGc < Test::Unit::TestCase assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR=2.0/, "") env = { - "RUBY_GC_OLDSPACE_LIMIT" => "60000000", - "RUBY_GC_OLDSPACE_LIMIT_MAX" => "160000000", - "RUBY_GC_OLDSPACE_LIMIT_GROWTH_FACTOR" => "2.0" + "RUBY_GC_OLDMALLOC_LIMIT" => "60000000", + "RUBY_GC_OLDMALLOC_LIMIT_MAX" => "160000000", + "RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR" => "2.0" } assert_normal_exit("exit", "", :child_env => env) - assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_OLDSPACE_LIMIT=6000000/, "") - assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_OLDSPACE_LIMIT_MAX=16000000/, "") - assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_OLDSPACE_LIMIT_GROWTH_FACTOR=2.0/, "") + assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_OLDMALLOC_LIMIT=6000000/, "") + assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_OLDMALLOC_LIMIT_MAX=16000000/, "") + assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR=2.0/, "") end def test_profiler_enabled