usa	2012-11-30 23:29:03 +0900 (Fri, 30 Nov 2012)

  New Revision: 38065

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

  Log:
    * test/rubygems/test_gem_ext_ext_conf_builder.rb
      (TestGemExtExtConfBuilder::test_class_make): reading with binary mode
      of course introduce \r on Windows.  see [ruby-core:50388].

  Modified files:
    trunk/ChangeLog
    trunk/test/rubygems/test_gem_ext_ext_conf_builder.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38064)
+++ ChangeLog	(revision 38065)
@@ -1,3 +1,9 @@
+Fri Nov 30 23:27:26 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/rubygems/test_gem_ext_ext_conf_builder.rb
+	  (TestGemExtExtConfBuilder::test_class_make): reading with binary mode
+	  of course introduce \r on Windows.  see [ruby-core:50388].
+
 Fri Nov 30 23:11:37 2012  NAKAMURA Usaku  <usa@r...>
 
 	* lib/rubygems/specification.rb
Index: test/rubygems/test_gem_ext_ext_conf_builder.rb
===================================================================
--- test/rubygems/test_gem_ext_ext_conf_builder.rb	(revision 38064)
+++ test/rubygems/test_gem_ext_ext_conf_builder.rb	(revision 38065)
@@ -136,6 +136,7 @@
     assert_equal "#{make_command} install", output[2]
 
     edited_makefile = Gem.read_binary makefile_path
+    edited_makefile.gsub!(/\r/, '') if Gem.win_platform?
 
     assert_match "\nRUBYARCHDIR = #{@ext}$(target_prefix)\n", edited_makefile
     assert_match "\nRUBYLIBDIR = #{@ext}$(target_prefix)\n", edited_makefile

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