hsbt	2018-05-30 22:03:47 +0900 (Wed, 30 May 2018)

  New Revision: 63531

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63531

  Log:
    Ignore bundler assertions on ruby core test suite.

  Modified files:
    trunk/test/rubygems/test_gem_commands_setup_command.rb
Index: test/rubygems/test_gem_commands_setup_command.rb
===================================================================
--- test/rubygems/test_gem_commands_setup_command.rb	(revision 63530)
+++ test/rubygems/test_gem_commands_setup_command.rb	(revision 63531)
@@ -114,17 +114,23 @@ class TestGemCommandsSetupCommand < Gem: https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_commands_setup_command.rb#L114
     @cmd.execute
 
     default_gem_bin_path = File.join @install_dir, 'bin', 'gem'
-    default_bundle_bin_path = File.join @install_dir, 'bin', 'bundle'
+    if Gem::USE_BUNDLER_FOR_GEMDEPS
+      default_bundle_bin_path = File.join @install_dir, 'bin', 'bundle'
+    end
 
     ruby_exec = sprintf Gem.default_exec_format, 'ruby'
 
     if Gem.win_platform?
       assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_gem_bin_path)
-      assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_bundle_bin_path)
+      if Gem::USE_BUNDLER_FOR_GEMDEPS
+        assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_bundle_bin_path)
+      end
       assert_match %r%\A#!\s*#{ruby_exec}%, File.read(gem_bin_path)
     else
       assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_gem_bin_path)
-      assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_bundle_bin_path)
+      if Gem::USE_BUNDLER_FOR_GEMDEPS
+        assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_bundle_bin_path)
+      end
       assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(gem_bin_path)
     end
   end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/