Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* 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
  • Loading branch information...
commit 88f5a4ff2d2201a455a4b056acccefd42eb18ac4 1 parent 8baab38
@drbrain drbrain authored
Showing with 10 additions and 3 deletions.
  1. +7 −0 ChangeLog
  2. +1 −1  lib/tracer.rb
  3. +2 −2 test/test_tracer.rb
View
7 ChangeLog
@@ -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
View
2  lib/tracer.rb
@@ -289,7 +289,7 @@ def Tracer.add_filter(p = proc)
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
View
4 test/test_tracer.rb
@@ -9,11 +9,11 @@ def test_tracer_with_option_r
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
Please sign in to comment.
Something went wrong with that request. Please try again.