From afedfb110b34c42ac7882014e8b1f85969e90d57 Mon Sep 17 00:00:00 2001
From: "Denny C. Dai" <dennycd@me.com>
Date: Wed, 1 Jun 2022 21:12:20 -0700
Subject: [PATCH] [gRPC/iOS] tvOS unit test fix and pass defs (#29858)

Fixing tvOS unit test build break and passing in interop test server addr via GCC_PREPROCESSOR_DEFINITIONS.
Previously this is passed directly via xcodebuild predefines but it is not visible to TestCommon lib
---
 .../tests/Tests.xcodeproj/project.pbxproj         |  3 ---
 .../xcshareddata/xcschemes/TvTests.xcscheme       | 15 ---------------
 src/objective-c/tests/run_one_test.sh             | 14 ++++++--------
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/objective-c/tests/Tests.xcodeproj/project.pbxproj b/src/objective-c/tests/Tests.xcodeproj/project.pbxproj
index b9eec273b5e..4629ea6c16e 100644
--- a/src/objective-c/tests/Tests.xcodeproj/project.pbxproj
+++ b/src/objective-c/tests/Tests.xcodeproj/project.pbxproj
@@ -1263,9 +1263,6 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
-					"HOST_PORT_LOCALSSL=$(HOST_PORT_LOCALSSL)",
-					"HOST_PORT_LOCAL=$(HOST_PORT_LOCAL)",
-					"HOST_PORT_REMOTE=$(HOST_PORT_REMOTE)",
 					"GRPC_TEST_OBJC=1",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
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 96a0cbb6be9..eddff505ade 100644
--- a/src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/TvTests.xcscheme
+++ b/src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/TvTests.xcscheme
@@ -65,26 +65,11 @@
          </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 10865460edc..ed1ea56a427 100755
--- a/src/objective-c/tests/run_one_test.sh
+++ b/src/objective-c/tests/run_one_test.sh
@@ -79,16 +79,14 @@ 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
+TEST_DEFS="HOST_PORT_LOCAL=localhost:$PLAIN_PORT \
+HOST_PORT_LOCALSSL=localhost:$TLS_PORT \
+HOST_PORT_REMOTE=grpc-test.sandbox.googleapis.com \
+GCC_OPTIMIZATION_LEVEL=s"
 
 time xcodebuild \
     -workspace Tests.xcworkspace \
     -scheme $SCHEME \
-    -destination "$DESTINATION" \
-    HOST_PORT_LOCALSSL=$HOST_PORT_LOCALSSL \
-    HOST_PORT_LOCAL=$HOST_PORT_LOCAL \
-    HOST_PORT_REMOTE=$HOST_PORT_REMOTE \
-    GCC_OPTIMIZATION_LEVEL=s \
+    -destination "${DESTINATION}" \
+    GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS'" $TEST_DEFS" \
     test | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"