Merge pull request #1157 from ruby/ak/import-recent-changes-in-ruby

Import manually changes in ruby/ruby#10947

core/tracepoint/inspect_spec.rb

@@ -24,6 +24,8 @@
     line = nil
     TracePoint.new(:line) { |tp|
       next unless TracePointSpec.target_thread?
+      next unless tp.path == __FILE__
+
       inspect ||= tp.inspect
     }.enable do
       line = __LINE__
@@ -37,6 +39,8 @@
     line = nil
     TracePoint.new(:call) { |tp|
       next unless TracePointSpec.target_thread?
+      next unless tp.path == __FILE__
+
       inspect ||= tp.inspect
     }.enable do
       line = __LINE__ + 1
@@ -52,6 +56,8 @@ def trace_point_spec_test_call; end
     line = nil
     TracePoint.new(:return) { |tp|
       next unless TracePointSpec.target_thread?
+      next unless tp.path == __FILE__
+
       inspect ||= tp.inspect
     }.enable do
       line = __LINE__ + 4
@@ -69,6 +75,8 @@ def trace_point_spec_test_return
     inspect = nil
     tracepoint = TracePoint.new(:c_call) { |tp|
       next unless TracePointSpec.target_thread?
+      next unless tp.path == __FILE__
+
       inspect ||= tp.inspect
     }
     line = __LINE__ + 2
@@ -84,6 +92,8 @@ def trace_point_spec_test_return
     line = nil
     TracePoint.new(:class) { |tp|
       next unless TracePointSpec.target_thread?
+      next unless tp.path == __FILE__
+
       inspect ||= tp.inspect
     }.enable do
       line = __LINE__ + 1
@@ -100,6 +110,7 @@ class TracePointSpec::C
     thread_inspection = nil
     TracePoint.new(:thread_begin) { |tp|
       next unless Thread.current == thread
+
       inspect ||= tp.inspect
     }.enable(target_thread: nil) do
       thread = Thread.new {}
@@ -116,6 +127,7 @@ class TracePointSpec::C
     thread_inspection = nil
     TracePoint.new(:thread_end) { |tp|
       next unless Thread.current == thread
+
       inspect ||= tp.inspect
     }.enable(target_thread: nil) do
       thread = Thread.new {}