1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
nagachika 2015-11-27 20:43:31 +00:00
parent b6f5c22567
commit b908b2d69e
3 changed files with 12 additions and 1 deletions

View file

@ -1,3 +1,10 @@
Sat Nov 28 05:35:28 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* 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 <ko1@atdot.net>
* insns.def (defined): skip respond_to_missing? when

View file

@ -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

View file

@ -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