Do not include settings from file accessors of test specs into aggregate xcconfigs #7019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dnkoutso
force-pushed
the
no_test_frameworks_on_aggregates
branch
3 times, most recently
from
fdf22bf
to
3dc419e
Compare
dnkoutso
force-pushed
the
no_test_frameworks_on_aggregates
branch
from
3dc419e
to
81bee36
Compare
dnkoutso
commented
Sep 10, 2017
| @@ -76,13 +76,15 @@ def self.default_ld_flags(target, include_objc_flag = false) | |||
| # | |||
| def self.add_settings_for_file_accessors_of_target(aggregate_target, pod_target, xcconfig) | |||
| pod_target.file_accessors.each do |file_accessor| | |||
| XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, xcconfig) | |||
| XCConfigHelper.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, file_accessor) | |||
| if aggregate_target.nil? || !file_accessor.spec.test_specification? | |||
There was a problem hiding this comment.
this is the check thats important here and in the other methods...
dnkoutso
commented
Sep 10, 2017
| @@ -241,6 +241,93 @@ module XCConfig | |||
|
|
|||
| #---------------------------------------------------------------------# | |||
|
|
|||
| describe 'concerning settings for file accessors' do | |||
There was a problem hiding this comment.
This change basically ensures test spec paths dont end up in aggregates
There was a problem hiding this comment.
:) Yeah, if I understand correctly, this change is preventing test spec paths from ending up in aggregates, while #6988 was about making sure that paths were properly propagated aggregates including static frameworks.
endocrimes
approved these changes
Sep 11, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.