summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <[email protected]>2024-07-13 13:06:46 +0900
committerKevin Newton <[email protected]>2024-07-17 14:06:11 -0400
commit278bbd7b45994c925633cd3cca280b3cabc913db (patch)
tree9de8a8bce99ef6b46f1acee866cdbcbc0914d175
parent644424941a771f471134c40204ecbb4589dc74f2 (diff)
Revert pending `EVENT_RETURN` tests
* "Allow ambiguosity of `return` line" 65b991bc8571b7b718fc22bd33a43c4d269bf52d * "Move to test/.excludes-prism" 3b4ff810d2fefdf0194bd774bc04f6f17e2ccae7 * "Pending `EVENT_RETURN` settracefunc tests with Prism" a7f33c99c69e3cc62b7a24ce35f51f76cc5bfaa2
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/11163
-rw-r--r--spec/ruby/core/tracepoint/inspect_spec.rb2
-rw-r--r--test/.excludes-prism/TestSetTraceFunc.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/spec/ruby/core/tracepoint/inspect_spec.rb b/spec/ruby/core/tracepoint/inspect_spec.rb
index d0e633c49b..6cc2ebe243 100644
--- a/spec/ruby/core/tracepoint/inspect_spec.rb
+++ b/spec/ruby/core/tracepoint/inspect_spec.rb
@@ -67,7 +67,7 @@ describe 'TracePoint#inspect' do
end
trace_point_spec_test_return
end
- ruby_version_is("3.4") { line = "(?:#{line}|#{line-1})" }
+ ruby_version_is("3.4") { line -= 1 }
inspect.should =~ /\A#<TracePoint:return [`']trace_point_spec_test_return'#{@path_prefix}#{__FILE__}:#{line}>\z/
end
diff --git a/test/.excludes-prism/TestSetTraceFunc.rb b/test/.excludes-prism/TestSetTraceFunc.rb
deleted file mode 100644
index 9c79044c77..0000000000
--- a/test/.excludes-prism/TestSetTraceFunc.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-exclude(:test_return, "[Bug #20457]")
-exclude(:test_return2, "[Bug #20457]")