summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-08 07:23:21 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-08 07:23:21 +0000
commitdb52886028374adf9ed7076a5c124f2951fc2c0a (patch)
treea61180247a4b9c14dc7188899a87e174f87f05a5
parent7410e17f074977456cc609063dc340ba688d8cca (diff)
no need to set bundled bundler unless Gem::USE_BUNDLER_FOR_GEMDEPS
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/rubygems/test_gem_commands_setup_command.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb
index f5388a0db2..c9f21b496a 100644
--- a/test/rubygems/test_gem_commands_setup_command.rb
+++ b/test/rubygems/test_gem_commands_setup_command.rb
@@ -8,7 +8,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
gem = File.exist?(gem = File.expand_path("bin/gem", @@project_dir)) ?
[ENV["RUBY"] || "ruby", gem] : ["gem"]
- BUNDLER_VERS = IO.popen(gem + %w[list -e bundler], &:read)[/([^() ]+)\)\Z/, 1] || "1.16.1"
+ BUNDLER_VERS = IO.popen(gem + %w[list -e bundler], &:read)[/([^() ]+)\)\Z/, 1] || "1.16.1" if Gem::USE_BUNDLER_FOR_GEMDEPS
def setup
super
@@ -25,6 +25,8 @@ class TestGemCommandsSetupCommand < Gem::TestCase
File.open 'lib/rubygems/test_case.rb', 'w' do |io| io.puts '# test_case.rb' end
File.open 'lib/rubygems/ssl_certs/rubygems.org/foo.pem', 'w' do |io| io.puts 'PEM' end
+ return unless Gem::USE_BUNDLER_FOR_GEMDEPS
+
FileUtils.mkdir_p 'bundler/exe'
FileUtils.mkdir_p 'bundler/lib/bundler'