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

Refuse to install Git if HOMEBREW_TEST_GENERIC_OS is set.

Browse Source
This commit is contained in:
Markus Reiter 2020-08-27 10:09:33 +02:00
parent bb1be7ef9d
commit 0129247391
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/test/utils/git_spec.rb
View File

@ -150,6 +150,8 @@ describe Utils::Git do
end
it "installs git" do
skip if ENV["HOMEBREW_TEST_GENERIC_OS"]
expect(described_class).to receive(:available?).and_return(false)
expect(described_class).to receive(:safe_system).with(HOMEBREW_BREW_FILE, "install", "git").and_return(true)
expect(described_class).to receive(:available?).and_return(true)

13
Library/Homebrew/utils/git.rb
View File

@ -94,13 +94,12 @@ module Utils
begin
oh1 "Installing #{Formatter.identifier("git")}"
# We need to unset `HOMEBREW_TEST_GENERIC_OS`, otherwise `git` will be
# installed from source in tests that need it. This is slow and will
# also likely fail due to `OS::Linux` and `OS::Mac` being undefined.
with_env "HOMEBREW_TEST_GENERIC_OS" => nil do
safe_system HOMEBREW_BREW_FILE, "install", "git"
clear_available_cache
end
# Otherwise `git` will be installed from source in tests that need it. This is slow
# and will also likely fail due to `OS::Linux` and `OS::Mac` being undefined.
raise "Refusing to install Git on a generic OS." if ENV["HOMEBREW_TEST_GENERIC_OS"]
safe_system HOMEBREW_BREW_FILE, "install", "git"
clear_available_cache
rescue
raise "Git is unavailable"
end