summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/objspace/test_objspace.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fa2dd8c710..5c16b95c13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 16 17:37:01 2015 Koichi Sasada <ko1@atdot.net>
+
+ * test/objspace/test_objspace.rb: relax pattern because uncollectible
+ flag and marked flag can be false at major GC.
+
Tue Jun 16 04:50:44 2015 Eric Wong <e@80x24.org>
* ext/socket/basicsocket.c (bsock_recv): document outbuf
diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb
index 8845b83c4e..0f0c904511 100644
--- a/test/objspace/test_objspace.rb
+++ b/test/objspace/test_objspace.rb
@@ -205,7 +205,7 @@ class TestObjSpace < Test::Unit::TestCase
def test_dump_flags
info = ObjectSpace.dump("foo".freeze)
- assert_match /"wb_protected":true, "old":true, "uncollectible":true, "marked":true/, info
+ assert_match /"wb_protected":true, "old":true/, info
assert_match /"fstring":true/, info
end