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

Fix tests

Browse Source
This commit is contained in:
Rylan Polster 2021-07-17 14:08:38 -04:00
parent 4ed44aa682
commit 9f15432742
No known key found for this signature in database
GPG Key ID: 46A744940CFF4D64
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/brew.rb
View File

@ -93,12 +93,14 @@ begin
internal_cmd ||= begin internal_cmd ||= begin
internal_dev_cmd = Commands.valid_internal_dev_cmd?(cmd) internal_dev_cmd = Commands.valid_internal_dev_cmd?(cmd)
if internal_dev_cmd && !Homebrew::EnvConfig.developer? if internal_dev_cmd && !Homebrew::EnvConfig.developer?
opoo <<~MESSAGE if ENV["HOMEBREW_DEV_CMD_RUN"].blank? if ENV["HOMEBREW_DEV_CMD_RUN"].blank? && ENV["HOMEBREW_TEST"].blank?
#{Tty.bold}#{cmd}#{Tty.reset} is a developer command, so opoo <<~MESSAGE
Homebrew's developer mode has been automatically turned on. #{Tty.bold}#{cmd}#{Tty.reset} is a developer command, so
To turn developer mode off, run #{Tty.bold}brew developer off#{Tty.reset} Homebrew's developer mode has been automatically turned on.
To turn developer mode off, run #{Tty.bold}brew developer off#{Tty.reset}
MESSAGE MESSAGE
end
Homebrew::Settings.write "devcmdrun", true Homebrew::Settings.write "devcmdrun", true
ENV["HOMEBREW_DEV_CMD_RUN"] = "1" ENV["HOMEBREW_DEV_CMD_RUN"] = "1"

2
Library/Homebrew/brew.sh
View File

@ -645,7 +645,7 @@ elif [[ -f "${HOMEBREW_LIBRARY}/Homebrew/dev-cmd/${HOMEBREW_COMMAND}.sh" ]]
then then
if [[ -z "${HOMEBREW_DEVELOPER}" ]] if [[ -z "${HOMEBREW_DEVELOPER}" ]]
then then
if [[ -z "${HOMEBREW_DEV_CMD_RUN}" ]] if [[ -z "${HOMEBREW_DEV_CMD_RUN}" ]] && [[ -z "${HOMEBREW_TEST}" ]]
then then
message="$(bold "${HOMEBREW_COMMAND}") is a developer command, so message="$(bold "${HOMEBREW_COMMAND}") is a developer command, so
Homebrew's developer mode has been automatically turned on. Homebrew's developer mode has been automatically turned on.

1
Library/Homebrew/dev-cmd/tests.rb
View File

@ -87,6 +87,7 @@ module Homebrew
ENV.delete(env) ENV.delete(env)
end end
ENV["HOMEBREW_TEST"] = "1"
ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1" ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
ENV["HOMEBREW_NO_COMPAT"] = "1" if args.no_compat? ENV["HOMEBREW_NO_COMPAT"] = "1" if args.no_compat?
ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic? ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic?