diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/rubygems/test_gem_ext_ext_conf_builder.rb | 1 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Fri Nov 30 23:27:26 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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@ruby-lang.org> * 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 |