From b5b86c7ff90ba482149b413b14fef7091ac58b2b Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 4 Jan 2009 06:16:06 +0000
Subject: merges r21279 from trunk into ruby_1_9_1. * test/ruby/test_sleep.rb
 (test_sleep_5sec): stop gc.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               | 4 ++++
 test/ruby/test_sleep.rb | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c769180f2..917fae75f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan  2 23:51:41 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_sleep.rb (test_sleep_5sec): stop gc.
+
 Fri Jan  2 23:36:10 2009  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/socket.c: don't apply socktype hack [ruby-core:184] for
diff --git a/test/ruby/test_sleep.rb b/test/ruby/test_sleep.rb
index 675fdc974..adc487621 100644
--- a/test/ruby/test_sleep.rb
+++ b/test/ruby/test_sleep.rb
@@ -2,9 +2,12 @@ require 'test/unit'
 
 class TestSleep < Test::Unit::TestCase
   def test_sleep_5sec
+    GC.disable
     start = Time.now
     sleep 5
     slept = Time.now-start
     assert_in_delta(5.0, slept, 0.1, "[ruby-core:18015]: longer than expected")
+  ensure
+    GC.enable
   end
 end
-- 
cgit