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

formula_installer: don't propagate --include-test unless requested

Browse Source
This commit is contained in:
Bo Anderson 2020-05-19 19:12:47 +01:00
parent b2fc8ad7b3
commit a2939be08a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/cli/args.rb
View File

@ -175,6 +175,12 @@ module Homebrew
formulae.any? { |args_f| args_f.full_name == f.full_name }
end
def include_formula_test_deps?(f)
return false unless include_test?
formulae.any? { |args_f| args_f.full_name == f.full_name }
end
private
def option_to_name(option)

4
Library/Homebrew/formula_installer.rb
View File

@ -490,7 +490,7 @@ class FormulaInstaller
Dependency.prune
elsif dep.test? || (dep.build? && install_bottle_for?(dependent, build))
keep = false
keep ||= dep.test? && include_test? && dependent == formula
keep ||= dep.test? && include_test? && Homebrew.args.include_formula_test_deps?(dependent)
keep ||= dep.build? && !install_bottle_for?(dependent, build)
Dependency.prune unless keep
elsif dep.prune_if_build_and_not_dependent?(dependent)
@ -569,6 +569,7 @@ class FormulaInstaller
fi.build_from_source = Homebrew.args.build_formula_from_source?(df)
fi.force_bottle = false
fi.include_test = Homebrew.args.include_formula_test_deps?(df)
fi.verbose = verbose?
fi.quiet = quiet?
fi.debug = debug?
@ -611,6 +612,7 @@ class FormulaInstaller
fi.options &= df.options
fi.build_from_source = Homebrew.args.build_formula_from_source?(df)
fi.force_bottle = false
fi.include_test = Homebrew.args.include_formula_test_deps?(df)
fi.verbose = verbose?
fi.quiet = quiet?
fi.debug = debug?