From 0f0d0dcdb3390fa25f9a34ac38f4d69396093dd7 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 16 Sep 2010 23:30:30 +0000 Subject: [PATCH] * lib/tracer.rb: count only non-internal libraries in stack trace, ignoring custom_require. [ruby-core:31858] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/tracer.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dba9767c34..7e8222a313 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 17 08:30:27 2010 Nobuyoshi Nakada + + * lib/tracer.rb: count only non-internal libraries in stack trace, + ignoring custom_require. [ruby-core:31858] + Fri Sep 17 02:18:41 2010 Akinori MUSHA * tool/mkconfig.rb: Fix build with m4 1.4.15 generating duplicate diff --git a/lib/tracer.rb b/lib/tracer.rb index a0b4fdf133..318b254ac8 100644 --- a/lib/tracer.rb +++ b/lib/tracer.rb @@ -190,6 +190,6 @@ if $0 == __FILE__ ARGV.shift Tracer.on require $0 -elsif caller.size <= 1 +elsif caller.count {|bt| /\A]+>:/ !~ bt} <= 1 Tracer.on end