From 8de619bee53b48353839f82d8198ce7e83f1832e Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 27 Jun 2014 14:34:31 +0000
Subject: test_env.rb: rehearsal

* test/ruby/test_env.rb (test_memory_leak_{aset,select,shift}):
  have a rehearsal before the main loop.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_env.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/ruby/test_env.rb b/test/ruby/test_env.rb
index 820d9dcb3c..be2b14333c 100644
--- a/test/ruby/test_env.rb
+++ b/test/ruby/test_env.rb
@@ -511,19 +511,23 @@ class TestEnv < Test::Unit::TestCase
 
   def test_memory_leak_aset
     bug9977 = '[ruby-dev:48323] [Bug #9977]'
-    assert_no_memory_leak([], <<-'end;', "5_000.times {ENV[k] = v}", bug9977)
+    assert_no_memory_leak([], <<-'end;', "5_000.times(&doit)", bug9977)
       ENV.clear
       k = 'FOO'
       v = (ENV[k] = 'bar'*5000 rescue 'bar'*1500)
+      doit = proc {ENV[k] = v}
+      50.times(&doit)
     end;
   end
 
   def test_memory_leak_select
     bug9978 = '[ruby-dev:48325] [Bug #9978]'
-    assert_no_memory_leak([], <<-'end;', "5_000.times {ENV.select {break}}", bug9978)
+    assert_no_memory_leak([], <<-'end;', "5_000.times(&doit)", bug9978)
       ENV.clear
       k = 'FOO'
       (ENV[k] = 'bar'*5000 rescue 'bar'*1500)
+      doit = proc {ENV.select {break}}
+      50.times(&doit)
     end;
   end
 
@@ -536,10 +540,12 @@ class TestEnv < Test::Unit::TestCase
 
   def test_memory_leak_shift
     bug9983 = '[ruby-dev:48332] [Bug #9983]'
-    assert_no_memory_leak([], <<-'end;', "5_000.times {ENV.shift; ENV[k] = v}", bug9983)
+    assert_no_memory_leak([], <<-'end;', "5_000.times(&doit)", bug9983)
       ENV.clear
       k = 'FOO'
       v = (ENV[k] = 'bar'*5000 rescue 'bar'*1500)
+      doit = proc {ENV[k] = v; ENV.shift}
+      50.times(&doit)
     end;
   end
 end
-- 
cgit v1.2.3