diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/objspace/test_objspace.rb | 3 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed Jun 17 02:53:59 2015 Koichi Sasada <ko1@atdot.net> + + * 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] + Mon Jun 15 03:24:23 2015 Koichi Sasada <ko1@atdot.net> * vm_insnhelper.c (lep_svar_set): add WBs. 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 @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.3" -#define RUBY_RELEASE_DATE "2015-06-15" -#define RUBY_PATCHLEVEL 134 +#define RUBY_RELEASE_DATE "2015-06-17" +#define RUBY_PATCHLEVEL 135 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_DAY 17 #include "ruby/version.h" |