From e330047ff9881eee9cbad8828ed1ef2f16b3050e Mon Sep 17 00:00:00 2001 From: Mike McQuaid <mike@mikemcquaid.com> Date: Sat, 26 Nov 2016 16:32:48 +0000 Subject: [PATCH] diagnostic: silence a Jenkins doctor warning. Allow our Jenkins CI testing for Homebrew/brew to live outside of `/usr/local` without complaint (as it's not using any binary packages anyway). --- Library/Homebrew/diagnostic.rb | 6 ++++++ Library/Homebrew/test/diagnostic_test.rb | 1 + 2 files changed, 7 insertions(+) diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 19148a6ae2..e8506ce807 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -407,6 +407,12 @@ module Homebrew def check_homebrew_prefix return if HOMEBREW_PREFIX.to_s == "/usr/local" + # Allow our Jenkins CI tests to live outside of /usr/local. + if ENV["JENKINS_HOME"] && + ENV["GIT_URL"].to_s.start_with?("https://github.com/Homebrew/brew") + return + end + <<-EOS.undent Your Homebrew's prefix is not /usr/local. You can install Homebrew anywhere you want but some bottles (binary packages) diff --git a/Library/Homebrew/test/diagnostic_test.rb b/Library/Homebrew/test/diagnostic_test.rb index aa2e44cfc8..c9bb524b0d 100644 --- a/Library/Homebrew/test/diagnostic_test.rb +++ b/Library/Homebrew/test/diagnostic_test.rb @@ -84,6 +84,7 @@ class DiagnosticChecksTest < Homebrew::TestCase end def test_check_homebrew_prefix + ENV.delete("JENKINS_HOME") # the integration tests are run in a special prefix assert_match "Your Homebrew's prefix is not /usr/local.", @checks.check_homebrew_prefix -- GitLab