nobu	2016-07-26 21:51:50 +0900 (Tue, 26 Jul 2016)

  New Revision: 55756

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55756

  Log:
    dtrace: chomp CR
    
    * test/dtrace/helper.rb (DTrace::TestCase::READ_PROBES): chomp CR
      by pty.  fix up r55736.

  Modified files:
    trunk/test/dtrace/helper.rb
    trunk/test/dtrace/test_method_cache.rb
Index: test/dtrace/helper.rb
===================================================================
--- test/dtrace/helper.rb	(revision 55755)
+++ test/dtrace/helper.rb	(revision 55756)
@@ -32,7 +32,7 @@ module DTrace https://github.com/ruby/ruby/blob/trunk/test/dtrace/helper.rb#L32
     when /darwin/i
       READ_PROBES = proc do |cmd|
         PTY.spawn(*cmd) do |io, _|
-          break io.readlines
+          break io.readlines.each {|line| line.sub!(/\r$/, "")}
         end
       end
     end
Index: test/dtrace/test_method_cache.rb
===================================================================
--- test/dtrace/test_method_cache.rb	(revision 55755)
+++ test/dtrace/test_method_cache.rb	(revision 55756)
@@ -9,9 +9,9 @@ module DTrace https://github.com/ruby/ruby/blob/trunk/test/dtrace/test_method_cache.rb#L9
         class String; def abc() end end
         class Object; def abc() end end
       code
-        assert_not_includes lines, "String #{rbfile} 1\n"
-        assert_includes     lines, "String #{rbfile} 2\n"
-        assert_includes     lines, "global #{rbfile} 3\n"
+        assert_not_include lines, "String #{rbfile} 1\n"
+        assert_include     lines, "String #{rbfile} 2\n"
+        assert_include     lines, "global #{rbfile} 3\n"
       end
     end
 

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