summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-16 18:19:10 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-16 18:19:10 +0000
commitb9f5a6c2497b55387a3ee907d5869fdb462d6233 (patch)
tree4a514d9f346792c9275ddf3998526c102bbf007f /test
parentbc69a7df4c6738d44b6fa75742458c6985750ddb (diff)
merge revision(s) 50914,50915: [Backport #10852]
* test/objspace/test_objspace.rb (test_dump_flags): relax pattern because long_lived flag and marked flag can be false at major GC. [Bug #10852] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/objspace/test_objspace.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb
index 66a8a1683b..6b38fc9d27 100644
--- a/test/objspace/test_objspace.rb
+++ b/test/objspace/test_objspace.rb
@@ -178,6 +178,7 @@ class TestObjSpace < Test::Unit::TestCase
obj2 = Object.new
end
ensure
+ GC.start
ObjectSpace.trace_object_allocations_stop
obj3 = Object.new
end
@@ -196,7 +197,7 @@ class TestObjSpace < Test::Unit::TestCase
def test_dump_flags
info = ObjectSpace.dump("foo".freeze)
- assert_match /"wb_protected":true, "old":true, "long_lived":true, "marked":true/, info
+ assert_match /"wb_protected":true, "old":true/, info
assert_match /"fstring":true/, info
end