diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-29 08:22:04 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-29 08:22:04 +0000 |
| commit | 88f5a4ff2d2201a455a4b056acccefd42eb18ac4 (patch) | |
| tree | 52e87432153e848d3ff2467f17164cc5fe220a33 | |
| parent | 8baab38ad20024d1f5d248a1c97bf144bc9e39e0 (diff) | |
| download | ruby-88f5a4ff2d2201a455a4b056acccefd42eb18ac4.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/tracer.rb | 2 | ||||
| -rw-r--r-- | test/test_tracer.rb | 4 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Thu Nov 29 17:19:26 2012 Eric Hodel <drbrain@segment7.net> + + * lib/tracer.rb: Updated to match removal of custom_require from + RubyGems. + * test/test_tracer.rb: ditto. Improved failure message if the test + fails + Thu Nov 29 17:15:00 2012 Zachary Scott <zachary@zacharyscott.net> * gc.c: Documentation for GC, GC::Profiler, ObjectSpace, and 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 diff --git a/test/test_tracer.rb b/test/test_tracer.rb index a1e0a4571c..918fed0446 100644 --- a/test/test_tracer.rb +++ b/test/test_tracer.rb @@ -9,11 +9,11 @@ class TestTracer < Test::Unit::TestCase assert_in_out_err(%w[-rtracer -e 1]) do |(*lines),| case lines.size when 2 - assert_match(%r{rubygems/custom_require\.rb:\d+:Kernel:<:}, lines[0]) + assert_match(%r{rubygems/core_ext/kernel_require\.rb:\d+:Kernel:<:}, lines[0]) when 1 # do nothing else - flunk "unexpected output from `ruby -rtracer -e 1`" + flunk "unexpected output from `ruby -rtracer -e 1`: #{lines.inspect}" end assert_equal "#0:-e:1::-: 1", lines.last end |