From a5dfaca00a94bc3d135aae52b4458f5a355bf0ed Mon Sep 17 00:00:00 2001 From: drbrain Date: Thu, 28 Feb 2013 22:25:55 +0000 Subject: * lib/rubygems/ext/builder.rb: Fix incompatibilities when installing extensions. Patch by Nobu. [ruby-trunk - Bug #7968] [ruby-trunk - Bug #7971] * lib/rubygems/ext/ext_conf_builder.rb: ditto. * lib/rubygems/installer.rb: ditto. * test/rubygems/test_gem_ext_ext_conf_builder.rb: Test for the above. * test/rubygems/test_gem_installer.rb: ditto. * lib/rubygems/commands/sources_command.rb: Prefer HTTPS over HTTP. * lib/rubygems/defaults.rb: ditto * lib/rubygems/dependency_resolver.rb: Ditto. * lib/rubygems/source.rb: ditto. * lib/rubygems/spec_fetcher.rb: ditto. * lib/rubygems/specification.rb: ditto. * lib/rubygems/test_utilities.rb: ditto. * test/rubygems/test_gem.rb: Test for the above. * test/rubygems/test_gem_commands_sources_command.rb: ditto. * test/rubygems/test_gem_dependency_resolver_api_set.rb: ditto. * test/rubygems/test_gem_remote_fetcher.rb: ditto. * test/rubygems/test_gem_source.rb: ditto. * test/rubygems/test_gem_spec_fetcher.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_ext_ext_conf_builder.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'test/rubygems/test_gem_ext_ext_conf_builder.rb') diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb index 4a492c1235..c899592442 100644 --- a/test/rubygems/test_gem_ext_ext_conf_builder.rb +++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb @@ -30,7 +30,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output end - assert_match(/^#{Gem.ruby} extconf.rb/, output[0]) + assert_match(/^#{Gem.ruby} .*extconf.rb/, output[0]) assert_equal "creating Makefile\n", output[1] case RUBY_PLATFORM when /mswin/ then @@ -107,10 +107,10 @@ class TestGemExtExtConfBuilder < Gem::TestCase assert_match(/\Aextconf failed: -#{Gem.ruby} extconf.rb.* +#{Gem.ruby} .*extconf.rb.* checking for main\(\) in .*?nonexistent/m, error.message) - assert_match(/^#{Gem.ruby} extconf.rb/, output[0]) + assert_match(/^#{Gem.ruby} .*extconf.rb/, output[0]) end def test_class_make @@ -134,12 +134,6 @@ checking for main\(\) in .*?nonexistent/m, error.message) assert_equal make_command, output[0] 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 end def test_class_make_no_Makefile -- cgit v1.2.3