From a235ef35b73b5ea8d80c98e607e0ad12ba8956d2 Mon Sep 17 00:00:00 2001
From: "Denny C. Dai" <dennycd@me.com>
Date: Fri, 27 May 2022 15:04:44 -0700
Subject: [PATCH] Fix tvos test break and pass interop server env (#29825)

---
 .../xcshareddata/xcschemes/TvTests.xcscheme     | 17 +++++++++++++++--
 src/objective-c/tests/run_one_test.sh           | 10 +++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/TvTests.xcscheme b/src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/TvTests.xcscheme
index 78bbc08f9d5..96a0cbb6be9 100644
--- a/src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/TvTests.xcscheme
+++ b/src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/TvTests.xcscheme
@@ -44,8 +44,6 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Test"
@@ -67,11 +65,26 @@
          </BuildableReference>
       </MacroExpansion>
       <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "HOST_PORT_LOCAL"
+            value = "localhost:5050"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "HOST_PORT_REMOTE"
+            value = "grpc-test.sandbox.googleapis.com"
+            isEnabled = "YES">
+         </EnvironmentVariable>
          <EnvironmentVariable
             key = "GRPC_CFSTREAM_RUN_LOOP"
             value = "1"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "HOST_PORT_LOCALSSL"
+            value = "localhost:5051"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
diff --git a/src/objective-c/tests/run_one_test.sh b/src/objective-c/tests/run_one_test.sh
index 94020c5c8a7..10865460edc 100755
--- a/src/objective-c/tests/run_one_test.sh
+++ b/src/objective-c/tests/run_one_test.sh
@@ -79,12 +79,16 @@ fi
 
 XCODEBUILD_FILTER_OUTPUT_SCRIPT="./xcodebuild_filter_output.sh"
 
+export HOST_PORT_LOCALSSL=localhost:$TLS_PORT
+export HOST_PORT_LOCAL=localhost:$PLAIN_PORT
+export HOST_PORT_REMOTE=grpc-test.sandbox.googleapis.com
+
 time xcodebuild \
     -workspace Tests.xcworkspace \
     -scheme $SCHEME \
     -destination "$DESTINATION" \
-    HOST_PORT_LOCALSSL=localhost:$TLS_PORT \
-    HOST_PORT_LOCAL=localhost:$PLAIN_PORT \
-    HOST_PORT_REMOTE=grpc-test.sandbox.googleapis.com \
+    HOST_PORT_LOCALSSL=$HOST_PORT_LOCALSSL \
+    HOST_PORT_LOCAL=$HOST_PORT_LOCAL \
+    HOST_PORT_REMOTE=$HOST_PORT_REMOTE \
     GCC_OPTIMIZATION_LEVEL=s \
     test | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"