Skip to content

Commit 898c29a

Browse files
committed
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://svn.ruby-lang.org/ruby/branches/ruby_2_1@44850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 9a372fa commit 898c29a

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

test/test_weakref.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,14 @@ def test_ref
1919
end
2020

2121
def test_recycled
22-
weak = make_weakref
23-
ObjectSpace.garbage_collect
24-
ObjectSpace.garbage_collect
22+
weaks = []
23+
weak = nil
24+
100.times do
25+
weaks << make_weakref
26+
ObjectSpace.garbage_collect
27+
ObjectSpace.garbage_collect
28+
break if weak = weaks.find {|w| !w.weakref_alive?}
29+
end
2530
assert_raise(WeakRef::RefError) {weak.to_s}
2631
assert_not_predicate(weak, :weakref_alive?)
2732
end

version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#define RUBY_VERSION "2.1.1"
2-
#define RUBY_RELEASE_DATE "2014-02-05"
3-
#define RUBY_PATCHLEVEL 23
2+
#define RUBY_RELEASE_DATE "2014-02-06"
3+
#define RUBY_PATCHLEVEL 24
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 2
7-
#define RUBY_RELEASE_DAY 5
7+
#define RUBY_RELEASE_DAY 6
88

99
#include "ruby/version.h"
1010

0 commit comments

Comments
 (0)