summaryrefslogtreecommitdiff
path: root/test/rubygems/test_gem_ext_configure_builder.rb
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-09 21:38:59 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-09 21:38:59 +0000
commit31c94ffeb5f09d09ac2c86fc9e6614e38251a43d (patch)
tree10e44506238c7af3d7c9d822111996731726e38d /test/rubygems/test_gem_ext_configure_builder.rb
parenta6afbaeb3be396c0fdea3b9077d9256c59edcfca (diff)
Update to RubyGems 1.3.4 r2223
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem_ext_configure_builder.rb')
-rw-r--r--test/rubygems/test_gem_ext_configure_builder.rb18
1 files changed, 8 insertions, 10 deletions
diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb
index 304fc8e3f7..8f8525f5fd 100644
--- a/test/rubygems/test_gem_ext_configure_builder.rb
+++ b/test/rubygems/test_gem_ext_configure_builder.rb
@@ -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