summaryrefslogtreecommitdiff
path: root/test/rubygems/test_gem_ext_ext_conf_builder.rb
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 14:29:03 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 14:29:03 +0000
commit053ca25f2d3876262e5830438a50816c4b66b944 (patch)
tree1260f88e3480cfa9e27a041c6f373906acc793c1 /test/rubygems/test_gem_ext_ext_conf_builder.rb
parentbcef71590ccc9e4a76d6ab2187d16b07ef9fd3a6 (diff)
* 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
Diffstat (limited to 'test/rubygems/test_gem_ext_ext_conf_builder.rb')
-rw-r--r--test/rubygems/test_gem_ext_ext_conf_builder.rb1
1 files changed, 1 insertions, 0 deletions
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