From 053ca25f2d3876262e5830438a50816c4b66b944 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 30 Nov 2012 14:29:03 +0000 Subject: [PATCH] * 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]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/rubygems/test_gem_ext_ext_conf_builder.rb | 1 + 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 365025fb7c..dfae754d33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 30 23:27:26 2012 NAKAMURA Usaku + + * 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 * lib/rubygems/specification.rb diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb index 2d20fed874..4a492c1235 100644 --- a/test/rubygems/test_gem_ext_ext_conf_builder.rb +++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb @@ -136,6 +136,7 @@ checking for main\(\) in .*?nonexistent/m, error.message) 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