summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-27 11:25:19 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-27 11:25:19 +0000
commitf8f026c4d60a284ffeb03f9804bea85dab5ff4fa (patch)
tree2ff1944feec941774858c04aa8f59f9d2d585e16 /test
parent4919dbabdb4042fee8cb3fb03c66536b1b032035 (diff)
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
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_settracefunc.rb6
1 files changed, 3 insertions, 3 deletions
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