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

Merge pull request #7604 from MikeMcQuaid/more_test_dependency_tweaks

Browse Source 
Further tweak :test dependency handling
This commit is contained in:
Mike McQuaid 2020-05-19 15:58:21 +01:00 committed by GitHub
commit 98ad4fe826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/build.rb
View File

@ -52,6 +52,8 @@ class Build
Requirement.prune Requirement.prune
elsif req.prune_if_build_and_not_dependent?(dependent, formula) elsif req.prune_if_build_and_not_dependent?(dependent, formula)
Requirement.prune Requirement.prune
elsif req.test?
Requirement.prune
end end
end end
end end
@ -65,6 +67,8 @@ class Build
Dependency.prune Dependency.prune
elsif dep.build? elsif dep.build?
Dependency.keep_but_prune_recursive_deps Dependency.keep_but_prune_recursive_deps
elsif dep.test?
Dependency.prune
end end
end end
end end

9
Library/Homebrew/formula_installer.rb
View File

@ -488,10 +488,11 @@ class FormulaInstaller
if dep.prune_from_option?(build) if dep.prune_from_option?(build)
Dependency.prune Dependency.prune
elsif dep.test? && !dep.build? && !include_test? elsif dep.test? || (dep.build? && install_bottle_for?(dependent, build))
Dependency.prune keep = false
elsif dep.build? && !dep.test? && install_bottle_for?(dependent, build) keep ||= dep.test? && include_test? && dependent == formula
Dependency.prune keep ||= dep.build? && !install_bottle_for?(dependent, build)
Dependency.prune unless keep
elsif dep.prune_if_build_and_not_dependent?(dependent) elsif dep.prune_if_build_and_not_dependent?(dependent)
Dependency.prune Dependency.prune
elsif dep.satisfied?(inherited_options[dep.name]) elsif dep.satisfied?(inherited_options[dep.name])