From 1f478676c4636c2a31dc5dbbcfcaa06edd6a8a8e Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 5 Feb 2014 15:47:37 +0000
Subject: [PATCH] merge revision(s) 44555:

	test_weakref.rb: find collected weakref

	* test/test_weakref.rb (test_recycled): retry and find a WeakRef
  whose the target is collected, to fix circumstance dependent.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/test_weakref.rb | 11 ++++++++---
 version.h            |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/test/test_weakref.rb b/test/test_weakref.rb
index 85820b17b8..f12e943423 100644
--- a/test/test_weakref.rb
+++ b/test/test_weakref.rb
@@ -19,9 +19,14 @@ class TestWeakRef < Test::Unit::TestCase
   end
 
   def test_recycled
-    weak = make_weakref
-    ObjectSpace.garbage_collect
-    ObjectSpace.garbage_collect
+    weaks = []
+    weak = nil
+    100.times do
+      weaks << make_weakref
+      ObjectSpace.garbage_collect
+      ObjectSpace.garbage_collect
+      break if weak = weaks.find {|w| !w.weakref_alive?}
+    end
     assert_raise(WeakRef::RefError) {weak.to_s}
     assert_not_predicate(weak, :weakref_alive?)
   end
diff --git a/version.h b/version.h
index 4ebbd65adf..a7c0dc8624 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.1.1"
-#define RUBY_RELEASE_DATE "2014-02-05"
-#define RUBY_PATCHLEVEL 23
+#define RUBY_RELEASE_DATE "2014-02-06"
+#define RUBY_PATCHLEVEL 24
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
 
 #include "ruby/version.h"