Merge branch 'master' of https://github.com/grpc/grpc into channelz

1 files changed, 10 insertions, 1 deletions

diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 014fb7d33a..e04b13b24c 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -1114,6 +1114,12 @@ class ObjCLanguage(object):
                     'SCHEME': 'SwiftSample',
                     'EXAMPLE_PATH': 'src/objective-c/examples/SwiftSample'
                 }),
+            self.config.job_spec(
+                ['test/core/iomgr/ios/CFStreamTests/run_tests.sh'],
+                timeout_seconds=10 * 60,
+                shortname='cfstream-tests',
+                cpu_cost=1e6,
+                environ=_FORCE_ENVIRON_FOR_WRAPPERS),
         ]
 
     def pre_build_steps(self):
@@ -1126,7 +1132,10 @@ class ObjCLanguage(object):
         return []
 
     def build_steps(self):
-        return [['src/objective-c/tests/build_tests.sh']]
+        return [
+            ['src/objective-c/tests/build_tests.sh'],
+            ['test/core/iomgr/ios/CFStreamTests/build_tests.sh'],
+        ]
 
     def post_tests_steps(self):
         return []