mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Update to RubyGems 1.3.4 r2223
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a6afbaeb3b
commit
31c94ffeb5
126 changed files with 7610 additions and 3747 deletions
|
@ -16,7 +16,7 @@ class TestGemExtConfigureBuilder < RubyGemTestCase
|
|||
end
|
||||
|
||||
def test_self_build
|
||||
return if RUBY_PLATFORM =~ /mswin/ # HACK
|
||||
skip("test_self_build skipped on MS Windows (VC++)") if vc_windows?
|
||||
|
||||
File.open File.join(@ext, './configure'), 'w' do |configure|
|
||||
configure.puts "#!/bin/sh\necho \"#{@makefile_body}\" > Makefile"
|
||||
|
@ -37,7 +37,7 @@ class TestGemExtConfigureBuilder < RubyGemTestCase
|
|||
end
|
||||
|
||||
def test_self_build_fail
|
||||
return if RUBY_PLATFORM =~ /mswin/ # HACK
|
||||
skip("test_self_build_fail skipped on MS Windows (VC++)") if vc_windows?
|
||||
output = []
|
||||
|
||||
error = assert_raises Gem::InstallError do
|
||||
|
@ -63,6 +63,10 @@ class TestGemExtConfigureBuilder < RubyGemTestCase
|
|||
end
|
||||
|
||||
def test_self_build_has_makefile
|
||||
if vc_windows? && !nmake_found?
|
||||
skip("test_self_build_has_makefile skipped - nmake not found")
|
||||
end
|
||||
|
||||
File.open File.join(@ext, 'Makefile'), 'w' do |makefile|
|
||||
makefile.puts @makefile_body
|
||||
end
|
||||
|
@ -72,14 +76,8 @@ class TestGemExtConfigureBuilder < RubyGemTestCase
|
|||
Gem::Ext::ConfigureBuilder.build nil, nil, @dest_path, output
|
||||
end
|
||||
|
||||
case RUBY_PLATFORM
|
||||
when /mswin/ then
|
||||
assert_equal 'nmake', output[0]
|
||||
assert_equal 'nmake install', output[2]
|
||||
else
|
||||
assert_equal 'make', output[0]
|
||||
assert_equal 'make install', output[2]
|
||||
end
|
||||
assert_equal make_command, output[0]
|
||||
assert_equal "#{make_command} install", output[2]
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue