mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
af9b1c958f
commit
b9212a7771
1 changed files with 9 additions and 3 deletions
|
@ -114,17 +114,23 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
||||||
@cmd.execute
|
@cmd.execute
|
||||||
|
|
||||||
default_gem_bin_path = File.join @install_dir, 'bin', 'gem'
|
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'
|
ruby_exec = sprintf Gem.default_exec_format, 'ruby'
|
||||||
|
|
||||||
if Gem.win_platform?
|
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_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)
|
assert_match %r%\A#!\s*#{ruby_exec}%, File.read(gem_bin_path)
|
||||||
else
|
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_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)
|
assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(gem_bin_path)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue