summaryrefslogtreecommitdiff
path: root/test/ruby
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-11 03:39:52 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-11 03:39:52 +0000
commita4cbd6412aa8b16893db47ff18243bb4d5371899 (patch)
treea19606236427c66213e19562785c546f803c9907 /test/ruby
parent3d4ceaaa14a052e87f560f3a8887cef2aa9d5fab (diff)
* eval.c (rb_raise_jump): pop frame after setup exception.
Patches by deivid (David Rodriguez). [Bug #8886] * test/minitest/test_minitest_unit.rb: catch up this change. * test/ruby/test_backtrace.rb: ditto. * test/ruby/test_settracefunc.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r--test/ruby/test_backtrace.rb2
-rw-r--r--test/ruby/test_settracefunc.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/ruby/test_backtrace.rb b/test/ruby/test_backtrace.rb
index 91dec4a943..e1491e9c63 100644
--- a/test/ruby/test_backtrace.rb
+++ b/test/ruby/test_backtrace.rb
@@ -10,7 +10,7 @@ class TestBacktrace < Test::Unit::TestCase
e.backtrace
end
}.resume
- assert_equal(1, bt.size)
+ assert_equal(2, bt.size)
assert_match(/.+:\d+:.+/, bt[0])
end
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index 1de7b901b0..42f1589a18 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -257,7 +257,7 @@ class TestSetTraceFunc < Test::Unit::TestCase
events.shift)
assert_equal(["c-return", 5, :backtrace, Exception],
events.shift)
- assert_equal(["raise", 5, :test_raise, TestSetTraceFunc],
+ assert_equal(["raise", 5, :raise, Kernel],
events.shift)
assert_equal(["c-return", 5, :raise, Kernel],
events.shift)
@@ -517,7 +517,7 @@ class TestSetTraceFunc < Test::Unit::TestCase
[:c_return,20, "xyzzy", Exception, :exception, RuntimeError, :outer, raised_exc],
[:c_call, 20, "xyzzy", Exception, :backtrace, raised_exc, :outer, :nothing],
[:c_return,20, "xyzzy", Exception, :backtrace, raised_exc, :outer, nil],
- [:raise, 20, "xyzzy", TestSetTraceFunc, :trace_by_tracepoint, self, :outer, raised_exc],
+ [:raise, 20, "xyzzy", Kernel, :raise, self, :outer, raised_exc],
[:c_return,20, "xyzzy", Kernel, :raise, self, :outer, nil],
[:c_call, 20, "xyzzy", Module, :===, RuntimeError,:outer, :nothing],
[:c_return,20, "xyzzy", Module, :===, RuntimeError,:outer, true],