diff options
-rw-r--r-- | lib/bundler/rubygems_ext.rb | 4 | ||||
-rw-r--r-- | test/rubygems/test_gem_specification.rb | 25 |
2 files changed, 2 insertions, 27 deletions
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index ff3defa5b4..35cc5b6cf8 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -83,8 +83,8 @@ module Gem # so we find them with heuristic way. We should improve it. if source.respond_to?(:root) return false if (full_require_paths - [extension_dir]).any? do |path| - File.exist?(File.join(path, "#{name}.#{RbConfig::CONFIG['DLEXT']}")) || - !Dir.glob(File.join(path, name, "*.#{RbConfig::CONFIG['DLEXT']}")).empty? + File.exist?(File.join(path, "#{name}.#{RbConfig::CONFIG["DLEXT"]}")) || + !Dir.glob(File.join(path, name, "*.#{RbConfig::CONFIG["DLEXT"]}")).empty? end end diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb index 375d51cce5..56ca7acaf2 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -3663,31 +3663,6 @@ end refute @a1.missing_extensions? end - def test_missing_extensions_eh_local_gemspec - pend "extensions don't quite work on jruby" if Gem.java_platform? - - spec = new_default_spec "default", 1 - spec.extensions << "extconf.rb" - - ext_spec - @ext.name = spec.name - FileUtils.mkdir_p File.join(@ext.gem_dir, "lib") - - # ext_spec used empty extconf.rb, so we need to create dummy extension for rake-compiler case. - # Ex. lib/gemname.so - FileUtils.touch File.join(@ext.gem_dir, "lib", "#{@ext.name}.#{RbConfig::CONFIG['DLEXT']}") - - refute @ext.missing_extensions? - - # Try to another case of extconf.rb - # Ex. lib/gemname/parser.so - FileUtils.rm File.join(@ext.gem_dir, "lib", "#{@ext.name}.#{RbConfig::CONFIG['DLEXT']}") - FileUtils.mkdir_p File.join(@ext.gem_dir, "lib", @ext.name) - FileUtils.touch File.join(@ext.gem_dir, "lib", @ext.name, "parser.#{RbConfig::CONFIG['DLEXT']}") - - refute @ext.missing_extensions? - end - def test_find_all_by_full_name pl = Gem::Platform.new "i386-linux" |