aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--test/ruby/test_settracefunc.rb20
2 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index adf34f1370..017faccb00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 16 23:39:13 2005 Shugo Maeda <shugo@ruby-lang.org>
+
+ * test/ruby/test_settracefunc.rb: added test for c-return.
+
Wed Mar 16 22:57:43 2005 Shugo Maeda <shugo@ruby-lang.org>
* eval.c (rb_call0): call_cfunc() should be protected.
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index 515453245f..e8ac6e2abb 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -11,16 +11,18 @@ class TestSetTraceFunc < Test::Unit::TestCase
a = 1
foo
a
+ b = 1 + 2
set_trace_func nil
- assert_equal(["line", 11], events.shift) # line "a = 1"
- assert_equal(["line", 12], events.shift) # line "foo"
- assert_equal(["call", 4], events.shift) # call foo
- event, lineno = events.shift # return
- assert_equal("return", event)
- assert_equal(4, lineno) # [history] it could not be expected in 1.8
- assert_equal(["line", 13], events.shift) # line "a"
- assert_equal(["line", 14], events.shift) # line "set_trace_func nil"
- assert_equal(["c-call", 14], events.shift) # c-call set_trace_func
+ assert_equal(["line", 11], events.shift) # line "a = 1"
+ assert_equal(["line", 12], events.shift) # line "foo"
+ assert_equal(["call", 4], events.shift) # call foo
+ assert_equal(["return", 4], events.shift) # return foo
+ assert_equal(["line", 13], events.shift) # line "a"
+ assert_equal(["line", 14], events.shift) # line "b = 1 + 2"
+ assert_equal(["c-call", 14], events.shift) # c-call Fixnum#+
+ assert_equal(["c-return", 14], events.shift) # c-return Fixnum#+
+ assert_equal(["line", 15], events.shift) # line "set_trace_func nil"
+ assert_equal(["c-call", 15], events.shift) # c-call set_trace_func
end
end