Honor test spec deployment target during validation. #9999
Conversation
dnkoutso
force-pushed
the
fix_deployment_target_test_spec
branch
from
beb630c
to
f6dac8d
Compare
lib/cocoapods/validator.rb
Outdated
| @@ -757,7 +759,7 @@ def test_pod | |||
| UI.warn "Skipping test spec `#{test_spec.name}` on platform `#{consumer.platform_name}` since it is not supported.\n".yellow | |||
| else | |||
| scheme = @installer.target_installation_results.first[pod_target.name].native_target_for_spec(test_spec) | |||
| output = xcodebuild('test', scheme, 'Debug') | |||
| output = xcodebuild('test', scheme, 'Debug', test_spec.deployment_target(consumer.platform_name)) | |||
There was a problem hiding this comment.
this method will also use the parent spec if none is explicitly specified.
lib/cocoapods/validator.rb
Outdated
| @@ -1048,7 +1050,7 @@ def parse_xcodebuild_output(output) | |||
| # @return [String] Executes xcodebuild in the current working directory and | |||
| # returns its output (both STDOUT and STDERR). | |||
| # | |||
| def xcodebuild(action, scheme, configuration) | |||
| def xcodebuild(action, scheme, configuration, deployment_target) | |||
There was a problem hiding this comment.
lol love how this is the only change to the method. variable shadowing ftw?
lib/cocoapods/validator.rb
Outdated
| @@ -1048,7 +1050,7 @@ def parse_xcodebuild_output(output) | |||
| # @return [String] Executes xcodebuild in the current working directory and | |||
| # returns its output (both STDOUT and STDERR). | |||
| # | |||
| def xcodebuild(action, scheme, configuration) | |||
| def xcodebuild(action, scheme, configuration, deployment_target) | |||
| @@ -600,6 +600,39 @@ def podspec_path(name = 'JSONKit', version = '1.4') | |||
| validator.results_message.strip.should.be.empty | |||
| end | |||
|
|
|||
| it 'uses the deployment target of the current test spec' do | |||
There was a problem hiding this comment.
it's not super clear to me what in here is validating that the correct deployment target is being used for xcodebuild ?
There was a problem hiding this comment.
it pulls a destination from Fourflusher once requesting iOS 8 for building the library and once requesting iOS 9 to run the test. at least that was my understanding. maybe would be better to add an expectation that xcodebuild is provided the correct deployment targets instead
There was a problem hiding this comment.
yeap. Those tests are super convoluted and hard to follow. I verified without my change this test fails.
dnkoutso
force-pushed
the
fix_deployment_target_test_spec
branch
3 times, most recently
from
80335dc
to
81e9d05
Compare
dnkoutso
force-pushed
the
fix_deployment_target_test_spec
branch
from
81e9d05
to
a6f9bfc
Compare
| @@ -1048,7 +1050,7 @@ def parse_xcodebuild_output(output) | |||
| # @return [String] Executes xcodebuild in the current working directory and | |||
| # returns its output (both STDOUT and STDERR). | |||
| # | |||
| def xcodebuild(action, scheme, configuration) | |||
| def xcodebuild(action, scheme, configuration, deployment_target:) | |||
There was a problem hiding this comment.
i see this is a new param, but the implementation does not seem to use it (or where this deployment_target refer to down in line 1059/1061? @dnkoutso
If a test spec has a different deployment target than the library spec during validation this was not honored by the validator.