summaryrefslogtreecommitdiff
path: root/test/-ext-
diff options
context:
space:
mode:
authorTakashi Kokubun <[email protected]>2024-11-12 20:47:48 -0800
committerTakashi Kokubun <[email protected]>2024-11-13 12:27:26 -0800
commit01db456196e17eb067f70eb1d4fceba143a51c01 (patch)
tree93676cc4ad94e59998f8b273cd18bfecc08b517f /test/-ext-
parentc9a5a71695af4596346e70f29dddb9ddb6106177 (diff)
Move Array#map to Ruby
Co-Authored-By: Aaron Patterson <[email protected]>
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/12074
Diffstat (limited to 'test/-ext-')
-rw-r--r--test/-ext-/debug/test_debug.rb13
-rw-r--r--test/-ext-/debug/test_profile_frames.rb3
2 files changed, 10 insertions, 6 deletions
diff --git a/test/-ext-/debug/test_debug.rb b/test/-ext-/debug/test_debug.rb
index b244eb41ea..98e178e34f 100644
--- a/test/-ext-/debug/test_debug.rb
+++ b/test/-ext-/debug/test_debug.rb
@@ -26,11 +26,14 @@ class TestDebug < Test::Unit::TestCase
count[:iseq] += 1
assert_instance_of(RubyVM::InstructionSequence, iseq, msg)
- # check same location
- assert_equal(loc.path, iseq.path, msg)
- assert_equal(loc.absolute_path, iseq.absolute_path, msg)
- #assert_equal(loc.label, iseq.label, msg)
- assert_operator(loc.lineno, :>=, iseq.first_lineno, msg)
+ # Backtraces and source locations don't match for :c_trace methods
+ unless iseq.disasm.include?('C_TRACE')
+ # check same location
+ assert_equal(loc.path, iseq.path, msg)
+ assert_equal(loc.absolute_path, iseq.absolute_path, msg)
+ #assert_equal(loc.label, iseq.label, msg)
+ assert_operator(loc.lineno, :>=, iseq.first_lineno, msg)
+ end
end
assert_instance_of(Thread::Backtrace::Location, loc, msg)
diff --git a/test/-ext-/debug/test_profile_frames.rb b/test/-ext-/debug/test_profile_frames.rb
index bd819266df..d79c94c468 100644
--- a/test/-ext-/debug/test_profile_frames.rb
+++ b/test/-ext-/debug/test_profile_frames.rb
@@ -209,8 +209,9 @@ class TestProfileFrames < Test::Unit::TestCase
profile_frames.shift
# The rest of the stack is expected to look the same...
- backtrace_locations.zip(profile_frames).each.with_index do |(location, (path, absolute_path, _, base_label, _, _, _, _, _, _, lineno)), i|
+ backtrace_locations.zip(profile_frames).each.with_index do |(location, (path, absolute_path, _, base_label, label, _, _, _, _, _, lineno)), i|
next if absolute_path == "<cfunc>" # ...except for cfunc frames
+ next if label in "Array#each" | "Array#map" # ...except for :c_trace method frames
err_msg = "#{i}th frame"
assert_equal(location.absolute_path, absolute_path, err_msg)