From 640966dbf397b26a763d1b445a522d6fa3d59eca Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Mon, 22 Jul 2019 10:03:08 -0700 Subject: [PATCH] fix internal testing targets --- gRPC.podspec | 2 +- src/objective-c/tests/Podfile | 2 +- templates/gRPC.podspec.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gRPC.podspec b/gRPC.podspec index 815da6ef7c1..b2d7b910042 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -90,7 +90,7 @@ Pod::Spec.new do |s| 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h', 'src/objective-c/GRPCClient/internal_testing/*.h' ss.private_header_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.h' - ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.h', + ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,m}', 'src/objective-c/GRPCClient/private/GRPCCore/*.{h,m}', 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h', 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.m', diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile index 4a821df85dc..20a68f7bf67 100644 --- a/src/objective-c/tests/Podfile +++ b/src/objective-c/tests/Podfile @@ -116,7 +116,7 @@ post_install do |installer| # 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 /gRPC-(mac|i)OS/.match(target.name) + if /gRPC(-macOS|-iOS|\.)/.match(target.name) target.build_configurations.each do |config| if config.name == 'Cronet' config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) COCOAPODS=1 GRPC_COMPILE_WITH_CRONET=1 GRPC_TEST_OBJC=1' diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index fa4d7608c26..2ba7089c717 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -92,7 +92,7 @@ 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h', 'src/objective-c/GRPCClient/internal_testing/*.h' ss.private_header_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.h' - ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.h', + ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,m}', 'src/objective-c/GRPCClient/private/GRPCCore/*.{h,m}', 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h', 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.m',