admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

test-bot: don't complain bottle errors when installing gcc and hg

Browse Source 
Closes Homebrew/homebrew#39626.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-05-18 18:44:27 +08:00
parent ae41a51976
commit 471c5502f5
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/cmd/test-bot.rb
View File

@ -386,7 +386,7 @@ module Homebrew
formula.conflicts.map { |c| Formulary.factory(c.name) }. formula.conflicts.map { |c| Formulary.factory(c.name) }.
select { |f| f.installed? }.each do |conflict| select { |f| f.installed? }.each do |conflict|
test "brew", "unlink", conflict.name test "brew", "unlink", conflict.name
end end
installed_gcc = false installed_gcc = false
@ -418,7 +418,11 @@ module Homebrew
CompilerSelector.select_for(formula) CompilerSelector.select_for(formula)
rescue CompilerSelectionError => e rescue CompilerSelectionError => e
unless installed_gcc unless installed_gcc
test "brew", "install", "gcc" if @formulae.include? "gcc"
run_as_not_developer { test "brew", "install", "gcc" }
else
test "brew", "install", "gcc"
end
installed_gcc = true installed_gcc = true
OS::Mac.clear_version_cache OS::Mac.clear_version_cache
retry retry
@ -448,7 +452,11 @@ module Homebrew
testable_dependents = dependents.select { |d| d.test_defined? && d.bottled? } testable_dependents = dependents.select { |d| d.test_defined? && d.bottled? }
if (deps | reqs).any? { |d| d.name == "mercurial" && d.build? } if (deps | reqs).any? { |d| d.name == "mercurial" && d.build? }
test "brew", "install", "mercurial" if @formulae.include? "mercurial"
run_as_not_developer { test "brew", "install", "mercurial" }
else
test "brew", "install", "mercurial"
end
end end
test "brew", "fetch", "--retry", *unchanged_dependencies unless unchanged_dependencies.empty? test "brew", "fetch", "--retry", *unchanged_dependencies unless unchanged_dependencies.empty?
@ -475,9 +483,9 @@ module Homebrew
install_args << canonical_formula_name install_args << canonical_formula_name
# Don't care about e.g. bottle failures for dependencies. # Don't care about e.g. bottle failures for dependencies.
ENV["HOMEBREW_DEVELOPER"] = nil run_as_not_developer do
test "brew", "install", "--only-dependencies", *install_args unless dependencies.empty? test "brew", "install", "--only-dependencies", *install_args unless dependencies.empty?
ENV["HOMEBREW_DEVELOPER"] = "1" end
test "brew", "install", *install_args test "brew", "install", *install_args
install_passed = steps.last.passed? install_passed = steps.last.passed?
audit_args = [canonical_formula_name] audit_args = [canonical_formula_name]

9
Library/Homebrew/utils.rb
View File

@ -150,6 +150,15 @@ ensure
ENV['PATH'] = old_path ENV['PATH'] = old_path
end end
def run_as_not_developer(&block)
begin
old = ENV.delete "HOMEBREW_DEVELOPER"
yield
ensure
ENV["HOMEBREW_DEVELOPER"] = old
end
end
# Kernel.system but with exceptions # Kernel.system but with exceptions
def safe_system cmd, *args def safe_system cmd, *args
Homebrew.system(cmd, *args) or raise ErrorDuringExecution.new(cmd, args) Homebrew.system(cmd, *args) or raise ErrorDuringExecution.new(cmd, args)