diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-30 13:03:47 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-30 13:03:47 +0000 |
commit | b9212a7771a5e67f3b48bbf4c76cd087a8d87e49 (patch) | |
tree | c8f8ae9e3c30e8d77edbe8ecb7b2fe0c82d3dd80 /test/rubygems | |
parent | af9b1c958fed43dd5ee88ec21060acab53c92159 (diff) |
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.rb | 12 |
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 |