diff options
| author | Mike McQuaid | 2016-07-12 19:46:29 +0100 |
|---|---|---|
| committer | GitHub | 2016-07-12 19:46:29 +0100 |
| commit | 23306ab434afc185e22a0f357a27e8da687620af (patch) | |
| tree | dcf29ed5354a34f609b1250d6f7c4ea81c5cbf12 /Library/Homebrew/dev-cmd/test-bot.rb | |
| parent | ed1d1e51da6bf464d6e461f5214e49f17b1f1842 (diff) | |
| download | brew-23306ab434afc185e22a0f357a27e8da687620af.tar.bz2 | |
github: produce better curl error messages. (#441)
* global: add RUBY_TWO global variable.
* test-bot: use RUBY_TWO global variable.
* github: produce better curl error messages.
If we don't know why curl has failed then ensure that the error messages
that it produced are included as part of the user output.
Diffstat (limited to 'Library/Homebrew/dev-cmd/test-bot.rb')
| -rw-r--r-- | Library/Homebrew/dev-cmd/test-bot.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb index b09d2608a..40e99f7b6 100644 --- a/Library/Homebrew/dev-cmd/test-bot.rb +++ b/Library/Homebrew/dev-cmd/test-bot.rb @@ -647,11 +647,9 @@ module Homebrew @category = __method__ return if @skip_homebrew - ruby_two = RUBY_VERSION.split(".").first.to_i >= 2 - if @tap.nil? tests_args = [] - if ruby_two + if RUBY_TWO tests_args << "--official-cmd-taps" tests_args << "--coverage" if ENV["TRAVIS"] end @@ -892,7 +890,7 @@ module Homebrew ENV["HOMEBREW_DEVELOPER"] = "1" ENV["HOMEBREW_SANDBOX"] = "1" - ENV["HOMEBREW_RUBY_MACHO"] = "1" if RUBY_VERSION.split(".").first.to_i >= 2 + ENV["HOMEBREW_RUBY_MACHO"] = "1" if RUBY_TWO ENV["HOMEBREW_NO_EMOJI"] = "1" ENV["HOMEBREW_FAIL_LOG_LINES"] = "150" ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"] = "1" |