aboutsummaryrefslogtreecommitdiffstats
path: root/test/rubygems
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-05-30 13:03:47 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-05-30 13:03:47 +0000
commit6f5c24494332774e58f8d4974254e11cadbd0cab (patch)
treec8f8ae9e3c30e8d77edbe8ecb7b2fe0c82d3dd80 /test/rubygems
parentcb348b78317fc2979bee6cb9e79b85959bce9d84 (diff)
downloadruby-6f5c24494332774e58f8d4974254e11cadbd0cab.tar.gz
Ignore bundler assertions on ruby core test suite.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems')
-rw-r--r--test/rubygems/test_gem_commands_setup_command.rb12
1 files changed, 9 insertions, 3 deletions
diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb
index 6d388ab0ee..c243121efa 100644
--- a/test/rubygems/test_gem_commands_setup_command.rb
+++ b/test/rubygems/test_gem_commands_setup_command.rb
@@ -114,17 +114,23 @@ class TestGemCommandsSetupCommand < Gem::TestCase
@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