aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/rubygems/test_gem_dependency_installer.rb8
-rw-r--r--test/rubygems/test_gem_installer.rb8
2 files changed, 12 insertions, 4 deletions
diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb
index bfebc6f63b..2b95597d4b 100644
--- a/test/rubygems/test_gem_dependency_installer.rb
+++ b/test/rubygems/test_gem_dependency_installer.rb
@@ -37,7 +37,7 @@ class TestGemDependencyInstaller < Gem::TestCase
def test_available_set_for_name
util_setup_gems
- p1a, gem = util_gem 'a', '10.a'
+ p1a, = util_gem 'a', '10.a'
util_setup_spec_fetcher p1a, @a1, @a1_pre
inst = Gem::DependencyInstaller.new
@@ -49,7 +49,7 @@ class TestGemDependencyInstaller < Gem::TestCase
def test_available_set_for_name_prerelease
util_setup_gems
- p1a, gem = util_gem 'a', '10.a'
+ p1a, = util_gem 'a', '10.a'
util_setup_spec_fetcher p1a, @a1, @a1_pre
inst = Gem::DependencyInstaller.new :prerelease => true
@@ -62,7 +62,7 @@ class TestGemDependencyInstaller < Gem::TestCase
def test_available_set_for_dep
util_setup_gems
- p1a, gem = util_gem 'a', '10.a'
+ p1a, = util_gem 'a', '10.a'
util_setup_spec_fetcher p1a, @a1, @a1_pre
inst = Gem::DependencyInstaller.new
@@ -76,7 +76,7 @@ class TestGemDependencyInstaller < Gem::TestCase
def test_available_set_for_dep_prerelease
util_setup_gems
- p1a, gem = util_gem 'a', '10.a'
+ p1a, = util_gem 'a', '10.a'
util_setup_spec_fetcher p1a, @a1, @a1_pre
inst = Gem::DependencyInstaller.new :prerelease => true
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index cf35a534b9..3f3d4c5a00 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -1060,6 +1060,7 @@ gem 'other', version
end
def test_install_extension_flat
+ skip '1.8 mkmf.rb does not create TOUCH' if RUBY_VERSION < '1.9'
@spec.require_paths = ["."]
@spec.extensions << "extconf.rb"
@@ -1089,6 +1090,13 @@ gem 'other', version
@installer.install
end
assert File.exist?(so)
+ rescue
+ puts '-' * 78
+ puts File.read File.join(@gemhome, 'gems', 'a-2', 'Makefile')
+ puts '-' * 78
+ puts File.read File.join(@gemhome, 'gems', 'a-2', 'gem_make.out')
+ puts '-' * 78
+ raise
end
def test_installation_satisfies_dependency_eh