aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXu Cheng2015-09-11 22:44:00 +0800
committerXu Cheng2015-09-11 22:44:00 +0800
commit7ce0a2dedbb580501557168cacf14e27525cd2ad (patch)
tree3878d3a62e8b6383c74489cacd447cbfbe54ab88
parente52a12a8b5f52ed80d6717214a53cedac347d8b8 (diff)
downloadbrew-7ce0a2dedbb580501557168cacf14e27525cd2ad.tar.bz2
test-bot: check ARGV.include?("--skip-homebrew") once
-rw-r--r--Library/Homebrew/cmd/test-bot.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 368244e05..6669a7971 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -184,7 +184,7 @@ module Homebrew
@steps = []
@tap = options[: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
@@ -860,13 +860,13 @@ module Homebrew
tests = []
any_errors = false
+ skip_homebrew = ARGV.include?("--skip-homebrew")
if ARGV.named.empty?
# 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
tests << head_test
else
- skip_homebrew = false
ARGV.named.each do |argument|
test_error = false
begin