From b908b2d69edf375868e1a67dab8fe8aede67ef65 Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 27 Nov 2015 20:43:31 +0000 Subject: [PATCH] merge revision(s) 52128,52133: [Backport #11271] * test/objspace/test_objspace.rb (test_trace_object_allocations_start_stop_clear): clear object allocation table first to get rid of erronous detection for obj3. [ruby-dev:49095] [Bug #11271] allocation table first to get rid of erroneous detection for obj3. because it is only delegation function. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/objspace/test_objspace.rb | 4 ++++ version.h | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0315818cbf..2b94260b2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Nov 28 05:35:28 2015 CHIKANAGA Tomoyuki + + * test/objspace/test_objspace.rb + (test_trace_object_allocations_start_stop_clear): clear object + allocation table first to get rid of erroneous detection for obj3. + [ruby-dev:49095] [Bug #11271] + Sat Nov 28 05:21:06 2015 Koichi Sasada * insns.def (defined): skip respond_to_missing? when diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb index 868a46e543..d8aac81c31 100644 --- a/test/objspace/test_objspace.rb +++ b/test/objspace/test_objspace.rb @@ -162,6 +162,8 @@ class TestObjSpace < Test::Unit::TestCase end def test_trace_object_allocations_start_stop_clear + ObjectSpace.trace_object_allocations_clear # clear object_table to get rid of erroneous detection for obj3 + GC.disable # suppress potential object reuse. see [Bug #11271] begin ObjectSpace.trace_object_allocations_start begin @@ -192,6 +194,8 @@ class TestObjSpace < Test::Unit::TestCase assert_equal(nil, ObjectSpace.allocation_sourcefile(obj1)) assert_equal(nil, ObjectSpace.allocation_sourcefile(obj2)) assert_equal(nil, ObjectSpace.allocation_sourcefile(obj3)) + ensure + GC.enable end def test_dump_flags diff --git a/version.h b/version.h index 1beb1a9006..9b9aa490d0 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.4" #define RUBY_RELEASE_DATE "2015-11-28" -#define RUBY_PATCHLEVEL 201 +#define RUBY_PATCHLEVEL 202 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 11