Merge pull request #6471 from scpeters/not_always_install_test_deps

formula_installer: don't always install test deps.
This commit is contained in:
Mike McQuaid 2019-09-19 08:41:05 +01:00 committed by GitHub
commit 1e725f486e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -483,8 +483,12 @@ class FormulaInstaller
if dep.prune_from_option?(build) if dep.prune_from_option?(build)
Dependency.prune Dependency.prune
elsif include_test? && dep.test? && !dep.installed? elsif dep.test?
if !include_test?
Dependency.prune
elsif !dep.installed?
Dependency.keep_but_prune_recursive_deps Dependency.keep_but_prune_recursive_deps
end
elsif dep.build? && install_bottle_for?(dependent, build) elsif dep.build? && install_bottle_for?(dependent, build)
Dependency.prune Dependency.prune
elsif dep.prune_if_build_and_not_dependent?(dependent) elsif dep.prune_if_build_and_not_dependent?(dependent)