From f8f026c4d60a284ffeb03f9804bea85dab5ff4fa Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 27 Mar 2017 11:25:19 +0000 Subject: merge revision(s) 56592: [Backport #11964] * eval.c, method.h, proc.c, vm.c, vm_eval.c, vm_insnhelper.c, vm_method.c: TracePoint#method_id should return method_id, not callee_id. [ruby-core:77241] [Feature #12747] * test/ruby/test_settracefunc.rb: change accordingly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_settracefunc.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index 7e099401f5..169d6716f4 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -1153,8 +1153,8 @@ class TestSetTraceFunc < Test::Unit::TestCase } assert_equal([ [:call, :size], - [:c_call, :original_size], - [:c_return, :original_size], + [:c_call, :size], + [:c_return, :size], [:return, :size] ], events, "should use alias method name for tracing c methods") end @@ -1287,7 +1287,7 @@ class TestSetTraceFunc < Test::Unit::TestCase }.enable{ p 1 } - }, %w[:p :inspect 1], [], '[Bug #9940]') + }, %w[:p :to_s 1], [], '[Bug #9940]') end def method_prefix event -- cgit v1.2.3