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

Improve type-checking style

Browse Source 
Co-authored-by: Douglas Eichelberger <dduugg@users.noreply.github.com>
This commit is contained in:
Carlo Cabrera 2023-04-04 01:51:37 +08:00
parent 3dc66fae9f
commit a2e97fe1ad
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/extend/os/linux/dev-cmd/determine-test-runners.rb
View File

@ -62,7 +62,7 @@ class TestRunnerFormula
).split("\n").map { |dependent| TestRunnerFormula.new(dependent) }.freeze ).split("\n").map { |dependent| TestRunnerFormula.new(dependent) }.freeze
end end
T.must(@dependent_hash[ENV["HOMEBREW_SIMULATE_MACOS_ON_LINUX"].present?]) @dependent_hash.fetch(ENV["HOMEBREW_SIMULATE_MACOS_ON_LINUX"].present?)
end end
end end
@ -81,18 +81,16 @@ module Homebrew
testing_formulae.any? do |formula| testing_formulae.any? do |formula|
# If the formula has a platform/arch/macOS version requirement, then its # If the formula has a platform/arch/macOS version requirement, then its
# dependents don't need to be tested if these requirements are not satisfied. # dependents don't need to be tested if these requirements are not satisfied.
next false if reject_platform && formula.method("#{reject_platform}_only?".to_sym).call next false if reject_platform && formula.method(:"#{reject_platform}_only?").call
next false if reject_arch && formula.method("#{reject_arch}_only?".to_sym).call next false if reject_arch && formula.method(:"#{reject_arch}_only?").call
next false if select_macos_version && !formula.compatible_with?(select_macos_version) next false if select_macos_version && !formula.compatible_with?(select_macos_version)
compatible_dependents = formula.dependents.dup compatible_dependents = formula.dependents.dup
if reject_arch compatible_dependents.reject! { |dependent_f| dependent_f.method(:"#{reject_arch}_only?").call } if reject_arch
compatible_dependents.reject! { |dependent_f| dependent_f.method("#{reject_arch}_only?".to_sym).call }
end
if reject_platform if reject_platform
compatible_dependents.reject! { |dependent_f| dependent_f.method("#{reject_platform}_only?".to_sym).call } compatible_dependents.reject! { |dependent_f| dependent_f.method(:"#{reject_platform}_only?").call }
end end
if select_macos_version if select_macos_version
@ -131,11 +129,9 @@ module Homebrew
compatible_formulae = formulae.dup compatible_formulae = formulae.dup
compatible_formulae.reject! { |formula| formula.method("#{reject_arch}_only?".to_sym).call } if reject_arch compatible_formulae.reject! { |formula| formula.method(:"#{reject_arch}_only?").call } if reject_arch
compatible_formulae.select! { |formula| formula.compatible_with?(select_macos_version) } if select_macos_version compatible_formulae.select! { |formula| formula.compatible_with?(select_macos_version) } if select_macos_version
if reject_platform compatible_formulae.reject! { |formula| formula.method(:"#{reject_platform}_only?").call } if reject_platform
compatible_formulae.reject! { |formula| formula.method("#{reject_platform}_only?".to_sym).call }
end
compatible_formulae.present? compatible_formulae.present?
end end