From bddf4b0237f9598df782effc5484120d3786c2f9 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 24 Jun 2016 04:13:11 +0000
Subject: * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*:   Update rubygems
 2.6.5 and 2.6.6.   Release note of 2.6.5:
 https://github.com/rubygems/rubygems/commit/656f5d94dc888d78d0d00f3598a4fa37391aac80
   Release note of 2.6.6:
 https://github.com/rubygems/rubygems/commit/ccb9c3300c063f5b5656669972d24a10ef8afbf5

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55495 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rubygems/test_gem.rb           |   7 +++
 test/rubygems/test_gem_installer.rb | 103 +++++++++++++++++++++++++-----------
 2 files changed, 79 insertions(+), 31 deletions(-)

(limited to 'test')

diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 81b2c01519..90695b56d7 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1695,6 +1695,13 @@ You may need to `gem install -g` to install missing gems
     ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps
   end
 
+  def test_platform_defaults
+    platform_defaults = Gem.platform_defaults
+
+    assert platform_defaults != nil
+    assert platform_defaults.is_a? Hash
+  end
+
   def ruby_install_name name
     orig_RUBY_INSTALL_NAME = RbConfig::CONFIG['ruby_install_name']
     RbConfig::CONFIG['ruby_install_name'] = name
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index ca48065bd4..2d747bed72 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -1141,47 +1141,88 @@ gem 'other', version
     refute_path_exists should_be_removed
   end
 
-  def test_find_lib_file_after_install
-    @spec.extensions << "extconf.rb"
-    write_file File.join(@tempdir, "extconf.rb") do |io|
-      io.write <<-RUBY
-        require "mkmf"
+  # ruby core repository needs to `depend` file for extension build.
+  # but 1.9.2 and earlier mkmf.rb does not create TOUCH file like depend.
+  if RUBY_VERSION < '1.9.3'
+    def test_find_lib_file_after_install
+
+      @spec.extensions << "extconf.rb"
+      write_file File.join(@tempdir, "extconf.rb") do |io|
+        io.write <<-RUBY
+          require "mkmf"
+          create_makefile("#{@spec.name}")
+        RUBY
+      end
 
-        CONFIG['CC'] = '$(TOUCH) $@ ||'
-        CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
-        $ruby = '#{Gem.ruby}'
+      write_file File.join(@tempdir, "a.c") do |io|
+        io.write <<-C
+          #include <ruby.h>
+          void Init_a() { }
+        C
+      end
 
-        create_makefile("#{@spec.name}")
-      RUBY
-    end
+      Dir.mkdir File.join(@tempdir, "lib")
+      write_file File.join(@tempdir, 'lib', "b.rb") do |io|
+        io.write "# b.rb"
+      end
 
-    write_file File.join(@tempdir, "depend")
+      @spec.files += %w[extconf.rb lib/b.rb a.c]
 
-    write_file File.join(@tempdir, "a.c") do |io|
-      io.write <<-C
-      #include <ruby.h>
-      void Init_a() { }
-      C
-    end
+      use_ui @ui do
+        path = Gem::Package.build @spec
+
+        installer = Gem::Installer.at path
+        installer.install
+      end
 
-    Dir.mkdir File.join(@tempdir, "lib")
-    write_file File.join(@tempdir, 'lib', "b.rb") do |io|
-      io.write "# b.rb"
+      expected = File.join @spec.full_require_paths.find { |path|
+        File.exist? File.join path, 'b.rb'
+      }, 'b.rb'
+      assert_equal expected, @spec.matches_for_glob('b.rb').first
     end
+  else
+    def test_find_lib_file_after_install
+      @spec.extensions << "extconf.rb"
+      write_file File.join(@tempdir, "extconf.rb") do |io|
+        io.write <<-RUBY
+          require "mkmf"
 
-    @spec.files += %w[extconf.rb lib/b.rb depend a.c]
+          CONFIG['CC'] = '$(TOUCH) $@ ||'
+          CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
+          $ruby = '#{Gem.ruby}'
 
-    use_ui @ui do
-      path = Gem::Package.build @spec
+          create_makefile("#{@spec.name}")
+        RUBY
+      end
 
-      installer = Gem::Installer.at path
-      installer.install
-    end
+      write_file File.join(@tempdir, "depend")
+
+      write_file File.join(@tempdir, "a.c") do |io|
+        io.write <<-C
+          #include <ruby.h>
+          void Init_a() { }
+        C
+      end
 
-    expected = File.join @spec.full_require_paths.find { |path|
-      File.exist? File.join path, 'b.rb'
-    }, 'b.rb'
-    assert_equal expected, @spec.matches_for_glob('b.rb').first
+      Dir.mkdir File.join(@tempdir, "lib")
+      write_file File.join(@tempdir, 'lib', "b.rb") do |io|
+        io.write "# b.rb"
+      end
+
+      @spec.files += %w[extconf.rb lib/b.rb depend a.c]
+
+      use_ui @ui do
+        path = Gem::Package.build @spec
+
+        installer = Gem::Installer.at path
+        installer.install
+      end
+
+      expected = File.join @spec.full_require_paths.find { |path|
+        File.exist? File.join path, 'b.rb'
+      }, 'b.rb'
+      assert_equal expected, @spec.matches_for_glob('b.rb').first
+    end
   end
 
   def test_install_extension_and_script
-- 
cgit v1.2.3