From 4b05feec758c6cc58de962de47ed8d95d7b36bc8 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Oct 2009 14:15:16 +0000 Subject: merges r24574 from trunk into ruby_1_9_1. -- * vm_insnhelper.c (vm_call_cfunc): ensure hook c-return. [Bug #1588] * test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_raise): follow above. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_settracefunc.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/ruby/test_settracefunc.rb') diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index 8e06c3b51..948616377 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -167,6 +167,8 @@ class TestSetTraceFunc < Test::Unit::TestCase events.shift) assert_equal(["raise", 5, :test_raise, TestSetTraceFunc], events.shift) + assert_equal(["c-return", 5, :raise, Kernel], + events.shift) assert_equal(["c-call", 6, :===, Module], events.shift) assert_equal(["c-return", 6, :===, Module], -- cgit