summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-29 08:22:04 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-29 08:22:04 +0000
commit88f5a4ff2d2201a455a4b056acccefd42eb18ac4 (patch)
tree52e87432153e848d3ff2467f17164cc5fe220a33 /lib
parent8baab38ad20024d1f5d248a1c97bf144bc9e39e0 (diff)
* lib/tracer.rb: Updated to match removal of custom_require from
RubyGems. * test/test_tracer.rb: ditto. Improved failure message if the test fails git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37988 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 7bb0678cef..0ad8ce5538 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -289,7 +289,7 @@ if $0 == __FILE__
require $0
else
# call Tracer.on only if required by -r command-line option
- count = caller.count {|bt| /\/rubygems\/custom_require.rb:/ !~ bt}
+ count = caller.count {|bt| %r%/rubygems/core_ext/kernel_require\.rb:% !~ bt}
if (defined?(Gem) and count == 0) or
(!defined?(Gem) and count <= 1)
Tracer.on