From 4fa08bbaf8f2c029f6df7f7ab85293cd31874b15 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 17 Oct 2013 21:03:49 +0000
Subject: * lib/rubygems:  Update to RubyGems master f738c67.  Changes:

  Fixed test bug for ruby with ENABLE_SHARED = no

* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rubygems/test_gem.rb               | 18 ++++++++++++++++++
 test/rubygems/test_gem_specification.rb | 24 ++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

(limited to 'test')

diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index a320d54884..88d0b1c432 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -338,6 +338,24 @@ class TestGem < Gem::TestCase
     end
   end
 
+  def test_self_extension_install_dir_shared
+    enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
+      RbConfig::CONFIG['ENABLE_SHARED'], 'yes'
+
+    assert_equal Gem.ruby_api_version, Gem.extension_api_version
+  ensure
+    RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared
+  end
+
+  def test_self_extension_install_dir_static
+    enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
+      RbConfig::CONFIG['ENABLE_SHARED'], 'no'
+
+    assert_equal "#{Gem.ruby_api_version}-static", Gem.extension_api_version
+  ensure
+    RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared
+  end
+
   def test_self_find_files
     cwd = File.expand_path("test/rubygems", @@project_dir)
     $LOAD_PATH.unshift cwd
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index 8efae025e7..5f7c64dd9d 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -1366,24 +1366,7 @@ dependencies: []
     assert_equal ['ext/extconf.rb'], ext_spec.extensions
   end
 
-  def test_extension_install_dir_shared
-    enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
-      RbConfig::CONFIG['ENABLE_SHARED'], 'yes'
-
-    ext_spec
-
-    refute_empty @ext.extensions
-
-    expected =
-      File.join(@ext.base_dir, 'extensions', Gem::Platform.local.to_s,
-                Gem.ruby_api_version,@ext.full_name)
-
-    assert_equal expected, @ext.extension_install_dir
-  ensure
-    RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared
-  end
-
-  def test_extension_install_dir_static
+  def test_extension_install_dir
     enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
       RbConfig::CONFIG['ENABLE_SHARED'], 'no'
 
@@ -1667,6 +1650,9 @@ dependencies: []
   end
 
   def test_require_paths
+    enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
+      RbConfig::CONFIG['ENABLE_SHARED'], 'no'
+
     ext_spec
 
     @ext.require_path = 'lib'
@@ -1677,6 +1663,8 @@ dependencies: []
       Pathname(@ext.extension_install_dir).relative_path_from lib
 
     assert_equal ['lib', ext_install_dir.to_s], @ext.require_paths
+  ensure
+    RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared
   end
 
   def test_full_require_paths
-- 
cgit v1.2.3