diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-17 21:03:49 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-17 21:03:49 +0000 |
commit | 4fa08bbaf8f2c029f6df7f7ab85293cd31874b15 (patch) | |
tree | dce42da415b127628c0410f0ab9231c53f6e89bb /test/rubygems/test_gem_specification.rb | |
parent | ef761f08881ce882cbd175b4aba1329678b30ea2 (diff) | |
download | ruby-4fa08bbaf8f2c029f6df7f7ab85293cd31874b15.tar.gz |
* 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
Diffstat (limited to 'test/rubygems/test_gem_specification.rb')
-rw-r--r-- | test/rubygems/test_gem_specification.rb | 24 |
1 files changed, 6 insertions, 18 deletions
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 |