Merge pull request #6435 from dnkoutso/master

Correctly set runtime search paths for OSX unit test bundles

CHANGELOG.md

@@ -27,6 +27,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#6373](https://github.com/CocoaPods/CocoaPods/issues/6373)
 
+* Correctly set runtime search paths for OSX unit test bundles when using frameworks.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6435](https://github.com/CocoaPods/CocoaPods/pull/6435)
+  
 * Add `--skip-import-validation` to skip linking a pod during lint.  
   [Samuel Giddins](https://github.com/segiddins)
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -217,8 +217,9 @@ module Pod
           ld_runpath_search_paths = ['$(inherited)']
           if target.platform.symbolic_name == :osx
             ld_runpath_search_paths << "'@executable_path/../Frameworks'"
+            symbol_type = target.user_targets.map(&:symbol_type).uniq.first
             ld_runpath_search_paths << \
-              if target.native_target.symbol_type == :unit_test_bundle
+              if symbol_type == :unit_test_bundle
                 "'@loader_path/../Frameworks'"
               else
                 "'@loader_path/Frameworks'"

cocoapods-integration-specs @ d6b41d09

-Subproject commit 10fea93357d6dda5f26165f7d92c4c66a2b47168
+Subproject commit d6b41d09e7a076f2f0078bce2f7cb1af9a7724a0

spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb

@@ -253,6 +253,20 @@ module Pod
             @generator.generate.to_hash['LD_RUNPATH_SEARCH_PATHS'].should == "$(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' '@executable_path/../../Frameworks'"
           end
 
+          it 'includes correct default runpath search path list for OSX unit test bundle user target' do
+            @target.stubs(:platform).returns(Platform.new(:osx, '10.10'))
+            mock_user_target = mock('usertarget', :symbol_type => :unit_test_bundle)
+            @target.stubs(:user_targets).returns([mock_user_target])
+            @generator.generate.to_hash['LD_RUNPATH_SEARCH_PATHS'].should == "$(inherited) '@executable_path/../Frameworks' '@loader_path/../Frameworks'"
+          end
+
+          it 'includes correct default runpath search path list for OSX application user target' do
+            @target.stubs(:platform).returns(Platform.new(:osx, '10.10'))
+            mock_user_target = mock('usertarget', :symbol_type => :application)
+            @target.stubs(:user_targets).returns([mock_user_target])
+            @generator.generate.to_hash['LD_RUNPATH_SEARCH_PATHS'].should == "$(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks'"
+          end
+
           it 'uses the target definition swift version' do
             @target_definition.stubs(:swift_version).returns('0.1')
             @generator.send(:target_swift_version).should == '0.1'