From 33201294eb59f10ccb98752207c2cc9d1c8757cc Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 27 Nov 2017 02:11:36 +0000 Subject: Ignore failures related to threading. * test/lib/tracepointchecker.rb: ignore "deletion trace" check when there are threads other than the main thread. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/lib/tracepointchecker.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/lib/tracepointchecker.rb b/test/lib/tracepointchecker.rb index 2fa40546b2..47822ecef5 100644 --- a/test/lib/tracepointchecker.rb +++ b/test/lib/tracepointchecker.rb @@ -6,9 +6,16 @@ module TracePointChecker } module ZombieTraceHunter - def before_setup - @tracepoint_captured_stat = TracePoint.stat.map{|k, (activated, deleted)| [k, activated, deleted]} + def tracepoint_capture_stat_get + TracePoint.stat.map{|k, (activated, deleted)| + deleted = 0 unless @tracepoint_captured_singlethread + [k, activated, deleted] + } + end + def before_setup + @tracepoint_captured_singlethread = (Thread.list.size == 1) + @tracepoint_captured_stat = tracepoint_capture_stat_get() super end @@ -18,7 +25,7 @@ module TracePointChecker # detect zombie traces. assert_equal( @tracepoint_captured_stat, - TracePoint.stat.map{|k, (activated, deleted)| [k, activated, deleted]}, + tracepoint_capture_stat_get(), "The number of active/deleted trace events was changed" ) # puts "TracePoint - deleted: #{deleted}" if deleted > 0 -- cgit v1.2.3