* test/ruby/test_settracefunc.rb: fix expected traces for

  RubyVM::FrozenCore's event and r17744.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 29 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index a62b101b72..6fb6a8ed4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  2 03:42:44 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_settracefunc.rb: fix expected traces for
+	  RubyVM::FrozenCore's event and r17744.
+
 Wed Jul  2 03:10:41 2008  Koichi Sasada  <ko1@atdot.net>
 
 	* compile.h, insns.def: reduce insn operand of "trace".
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index 1d280463f6..90cc14c64f 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -54,10 +54,14 @@ class TestSetTraceFunc < Test::Unit::TestCase
                  events.shift)
     assert_equal(["line", 4, __method__, self.class],
                  events.shift)
+    assert_equal(["c-call", 4, :core_define_method, RubyVM::FrozenCore],
+                 events.shift)
     assert_equal(["c-call", 4, :method_added, Module],
                  events.shift)
     assert_equal(["c-return", 4, :method_added, Module],
                  events.shift)
+    assert_equal(["c-return", 4, :core_define_method, RubyVM::FrozenCore],
+                 events.shift)
     assert_equal(["line", 7, __method__, self.class],
                  events.shift)
     assert_equal(["call", 6, :add, self.class],
@@ -102,10 +106,14 @@ class TestSetTraceFunc < Test::Unit::TestCase
                  events.shift)
     assert_equal(["line", 5, nil, nil],
                  events.shift)
+    assert_equal(["c-call", 5, :core_define_method, RubyVM::FrozenCore],
+                 events.shift)
     assert_equal(["c-call", 5, :method_added, Module],
                  events.shift)
     assert_equal(["c-return", 5, :method_added, Module],
                  events.shift)
+    assert_equal(["c-return", 5, :core_define_method, RubyVM::FrozenCore],
+                 events.shift)
     assert_equal(["end", 7, nil, nil],
                  events.shift)
     assert_equal(["line", 8, __method__, self.class],
@@ -145,33 +153,35 @@ class TestSetTraceFunc < Test::Unit::TestCase
                  events.shift)
     assert_equal(["line", 4, __method__, self.class],
                  events.shift)
-    assert_equal(["c-call", 4, :raise, Kernel],
+    assert_equal(["line", 5, __method__, self.class],
+                 events.shift)
+    assert_equal(["c-call", 5, :raise, Kernel],
                  events.shift)
-    assert_equal(["c-call", 4, :new, Class],
+    assert_equal(["c-call", 5, :exception, Exception],
                  events.shift)
-    assert_equal(["c-call", 4, :initialize, Exception],
+    assert_equal(["c-call", 5, :initialize, Exception],
                  events.shift)
-    assert_equal(["c-return", 4, :initialize, Exception],
+    assert_equal(["c-return", 5, :initialize, Exception],
                  events.shift)
-    assert_equal(["c-return", 4, :new, Class],
+    assert_equal(["c-return", 5, :exception, Exception],
                  events.shift)
-    assert_equal(["c-call", 4, :backtrace, Exception],
+    assert_equal(["c-call", 5, :backtrace, Exception],
                  events.shift)
-    assert_equal(["c-return", 4, :backtrace, Exception],
+    assert_equal(["c-return", 5, :backtrace, Exception],
                  events.shift)
-    assert_equal(["c-call", 4, :set_backtrace, Exception],
+    assert_equal(["c-call", 5, :set_backtrace, Exception],
                  events.shift)
-    assert_equal(["c-return", 4, :set_backtrace, Exception],
+    assert_equal(["c-return", 5, :set_backtrace, Exception],
                  events.shift)
-    assert_equal(["raise", 4, :test_raise, TestSetTraceFunc],
+    assert_equal(["raise", 5, :test_raise, TestSetTraceFunc],
                  events.shift)
-    assert_equal(["c-call", 4, :===, Module],
+    assert_equal(["c-call", 6, :===, Module],
                  events.shift)
-    assert_equal(["c-return", 4, :===, Module],
+    assert_equal(["c-return", 6, :===, Module],
                  events.shift)
-    assert_equal(["line", 5, __method__, self.class],
+    assert_equal(["line", 8, __method__, self.class],
                  events.shift)
-    assert_equal(["c-call", 5, :set_trace_func, Kernel],
+    assert_equal(["c-call", 8, :set_trace_func, Kernel],
                  events.shift)
     assert_equal([], events)
   end