1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
usa 2012-11-30 14:29:03 +00:00
parent bcef71590c
commit 053ca25f2d
2 changed files with 7 additions and 0 deletions

View file

@ -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

View file

@ -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