Skip to content

Commit a235ef3

Browse files
authored
Fix tvos test break and pass interop server env (grpc#29825)
1 parent 64b4220 commit a235ef3

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/TvTests.xcscheme

+15-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
</SkippedTests>
4545
</TestableReference>
4646
</Testables>
47-
<AdditionalOptions>
48-
</AdditionalOptions>
4947
</TestAction>
5048
<LaunchAction
5149
buildConfiguration = "Test"
@@ -67,11 +65,26 @@
6765
</BuildableReference>
6866
</MacroExpansion>
6967
<EnvironmentVariables>
68+
<EnvironmentVariable
69+
key = "HOST_PORT_LOCAL"
70+
value = "localhost:5050"
71+
isEnabled = "YES">
72+
</EnvironmentVariable>
73+
<EnvironmentVariable
74+
key = "HOST_PORT_REMOTE"
75+
value = "grpc-test.sandbox.googleapis.com"
76+
isEnabled = "YES">
77+
</EnvironmentVariable>
7078
<EnvironmentVariable
7179
key = "GRPC_CFSTREAM_RUN_LOOP"
7280
value = "1"
7381
isEnabled = "YES">
7482
</EnvironmentVariable>
83+
<EnvironmentVariable
84+
key = "HOST_PORT_LOCALSSL"
85+
value = "localhost:5051"
86+
isEnabled = "YES">
87+
</EnvironmentVariable>
7588
</EnvironmentVariables>
7689
</LaunchAction>
7790
<ProfileAction

src/objective-c/tests/run_one_test.sh

+7-3
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,16 @@ fi
7979

8080
XCODEBUILD_FILTER_OUTPUT_SCRIPT="./xcodebuild_filter_output.sh"
8181

82+
export HOST_PORT_LOCALSSL=localhost:$TLS_PORT
83+
export HOST_PORT_LOCAL=localhost:$PLAIN_PORT
84+
export HOST_PORT_REMOTE=grpc-test.sandbox.googleapis.com
85+
8286
time xcodebuild \
8387
-workspace Tests.xcworkspace \
8488
-scheme $SCHEME \
8589
-destination "$DESTINATION" \
86-
HOST_PORT_LOCALSSL=localhost:$TLS_PORT \
87-
HOST_PORT_LOCAL=localhost:$PLAIN_PORT \
88-
HOST_PORT_REMOTE=grpc-test.sandbox.googleapis.com \
90+
HOST_PORT_LOCALSSL=$HOST_PORT_LOCALSSL \
91+
HOST_PORT_LOCAL=$HOST_PORT_LOCAL \
92+
HOST_PORT_REMOTE=$HOST_PORT_REMOTE \
8993
GCC_OPTIMIZATION_LEVEL=s \
9094
test | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"

0 commit comments

Comments
 (0)