Merge remote-tracking branch 'upstream/master' into matt-tls13

5 years ago · d37b900ab7
parent 32c0846d45 c9759f9414
commit d37b900ab7
16 changed files with 49 additions and 46 deletions
--- a/src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/CronetTests.xcscheme
+++ b/src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/CronetTests.xcscheme
@ -44,8 +44,6 @@
            </SkippedTests>
         </TestableReference>
      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Cronet"
@ -66,8 +64,13 @@
            ReferencedContainer = "container:Tests.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "grpc_cfstream"
+            value = "0"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Cronet"