diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-03-29 19:46:48 +0200 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-03-29 19:46:48 +0200 |
commit | 0dac09e724d6fd8856f48e47e46f859e23a2d5d0 (patch) | |
tree | d89412653c4ab3f01cfe6192e7557f0583828928 /src/objective-c/tests/Podfile | |
parent | 1751acae882b6a6ed31bad01272013f26f0d5f0b (diff) | |
parent | 0ce55c0e4a3164293dea1240ab20f59c56c8f661 (diff) |
Merge branch 'master' of https://github.com/grpc/grpc into cpp_bazelness
Diffstat (limited to 'src/objective-c/tests/Podfile')
-rw-r--r-- | src/objective-c/tests/Podfile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile index 3760330be9..8f1cb041d8 100644 --- a/src/objective-c/tests/Podfile +++ b/src/objective-c/tests/Podfile @@ -97,15 +97,20 @@ post_install do |installer| # GPR_UNREACHABLE_CODE causes "Control may reach end of non-void # function" warning config.build_settings['GCC_WARN_ABOUT_RETURN_TYPE'] = 'NO' + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) COCOAPODS=1 GRPC_CRONET_WITH_PACKET_COALESCING=1' end end # Activate Cronet for the dedicated build configuration 'Cronet', which will be used solely by # the test target 'InteropTestsRemoteWithCronet' + # Activate GRPCCall+InternalTests functions for the dedicated build configuration 'Test', which will + # be used by all test targets using it. if target.name == 'gRPC' target.build_configurations.each do |config| if config.name == 'Cronet' - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) COCOAPODS=1 GRPC_COMPILE_WITH_CRONET=1' + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) COCOAPODS=1 GRPC_COMPILE_WITH_CRONET=1 GRPC_TEST_OBJC=1' + elsif config.name == 'Test' + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) COCOAPODS=1 GRPC_TEST_OBJC=1' end end end |