summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-24 09:37:20 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-24 09:37:20 +0000
commitc53b4f562bc1b4b2058c44fcf6e71ce0352c35d2 (patch)
tree31eadcfca2f5ce0c9a328d919ab357c1330059f5 /lib
parent1c1c514a678fae819117e07743eceb0c8d431bfd (diff)
merges r29280 from trunk into ruby_1_9_2 and adds a minimal regression
test. -- * 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/branches/ruby_1_9_2@29914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/tracer.rb2
1 files changed, 1 insertions, 1 deletions
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<internal:[^<>]+>:/ !~ bt} <= 1
Tracer.on
end