diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-31 07:55:32 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-31 07:55:32 +0000 |
commit | 3ed06c80eb01000bc293c5cd88a09e92a3c15904 (patch) | |
tree | 0432132f6eca9bf31d0d2cca08b59d12d21eefd4 /test | |
parent | f6838bc90b464fc1485f95b012d9776302df01af (diff) |
merge revision(s) 46471: [Backport #9964]
* compile.c (rb_iseq_compile_node): put start label of block after
trace (b_call).
[Bug #9964]
* test/ruby/test_settracefunc.rb: add a test.
added assert_consistent_call_return() method check call/return
consistency.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47340 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_settracefunc.rb | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index 184cc91566..831923c358 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -8,11 +8,17 @@ class TestSetTraceFunc < Test::Unit::TestCase :trace_instruction => true, :specialized_instruction => false } + @target_thread = Thread.current end def teardown set_trace_func(nil) RubyVM::InstructionSequence.compile_option = @original_compile_option + @target_thread = nil + end + + def target_thread? + Thread.current == @target_thread end def test_c_call @@ -1140,4 +1146,51 @@ class TestSetTraceFunc < Test::Unit::TestCase trace.disable end end + + def method_prefix event + case event + when :call, :return + :n + when :c_call, :c_return + :c + when :b_call, :b_return + :b + end + end + + def method_label tp + "#{method_prefix(tp.event)}##{tp.method_id}" + end + + def assert_consistent_call_return message='', check_events: nil + call_events = [] + return_events = [] + + TracePoint.new(*check_events){|tp| + next unless target_thread? + + case tp.event.to_s + when /call/ + call_events << method_label(tp) + when /return/ + return_events << method_label(tp) + end + }.enable do + yield + end + + assert_equal false, call_events.empty? + assert_equal false, return_events.empty? + assert_equal call_events, return_events.reverse, message + end + + def test_b_call_with_redo + assert_consistent_call_return do + i = 0 + 1.times{ + break if (i+=1) > 10 + redo + } + end + end end |