test-bot: check ARGV.include?("--skip-homebrew") once

This commit is contained in:
Xu Cheng 2015-09-11 22:44:00 +08:00
parent e52a12a8b5
commit 7ce0a2dedb

View File

@ -184,7 +184,7 @@ module Homebrew
@steps = [] @steps = []
@tap = options[:tap] @tap = options[:tap]
@repository = Homebrew.homebrew_git_repo @tap @repository = Homebrew.homebrew_git_repo @tap
@skip_homebrew = ARGV.include?("--skip-homebrew") || options[:skip_homebrew] @skip_homebrew = options[:skip_homebrew]
url_match = argument.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX url_match = argument.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX
@ -860,13 +860,13 @@ module Homebrew
tests = [] tests = []
any_errors = false any_errors = false
skip_homebrew = ARGV.include?("--skip-homebrew")
if ARGV.named.empty? if ARGV.named.empty?
# With no arguments just build the most recent commit. # With no arguments just build the most recent commit.
head_test = Test.new("HEAD", :tap => tap) head_test = Test.new("HEAD", :tap => tap, :skip_homebrew => skip_homebrew)
any_errors = !head_test.run any_errors = !head_test.run
tests << head_test tests << head_test
else else
skip_homebrew = false
ARGV.named.each do |argument| ARGV.named.each do |argument|
test_error = false test_error = false
begin begin