nagachika	2013-07-23 01:36:19 +0900 (Tue, 23 Jul 2013)

  New Revision: 42118

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42118

  Log:
    merge revision(s) 41857:
    
    * test/test_tracer.rb: catch up recent rubygems changes.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/test_tracer.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42117)
+++ ruby_2_0_0/ChangeLog	(revision 42118)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Jul 23 01:34:00 2013  Koichi Sasada  <ko1@a...>
+
+	* test/test_tracer.rb: catch up recent rubygems changes.
+
 Tue Jul 23 01:28:54 2013  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* lib/rubygems: Update to RubyGems 2.0.5.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42117)
+++ ruby_2_0_0/version.h	(revision 42118)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-07-23"
-#define RUBY_PATCHLEVEL 275
+#define RUBY_PATCHLEVEL 276
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7
Index: ruby_2_0_0/test/test_tracer.rb
===================================================================
--- ruby_2_0_0/test/test_tracer.rb	(revision 42117)
+++ ruby_2_0_0/test/test_tracer.rb	(revision 42118)
@@ -8,12 +8,10 @@ class TestTracer < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/test_tracer.rb#L8
   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/core_ext/kernel_require\.rb:\d+:Kernel:<:}, lines[0])
       when 1
         # do nothing
       else
-        flunk "unexpected output from `ruby -rtracer -e 1`: #{lines.inspect}"
+        assert_match(%r{rubygems/core_ext/kernel_require\.rb:\d+:Kernel:-:}, lines[0])
       end
       assert_equal "#0:-e:1::-: 1", lines.last
     end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41857


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/