final script fix for proper destination & target

grpc · Sep 21, 2022 · bbf217e · bbf217e
1 parent dda0ee4
commit bbf217e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/test/core/iomgr/ios/CFStreamTests/build_and_run_tests.sh b/test/core/iomgr/ios/CFStreamTests/build_and_run_tests.sh
@@ -23,28 +23,42 @@ cd "$(dirname "$0")"
 
 XCODEBUILD_FILTER_OUTPUT_SCRIPT="../../../../../src/objective-c/tests/xcodebuild_filter_output.sh"
 
+XCODEBUILD_FLAGS="
+  IPHONEOS_DEPLOYMENT_TARGET=9.0
+"
+
+XCODEBUILD_DESTINATION="platform=iOS Simulator,name=iPhone 11"
+
 time ./build_tests.sh
 
 time xcodebuild \
     -workspace CFStreamTests.xcworkspace \
     -scheme CFStreamTests \
-    -destination name="iPhone 8" \
-    test | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"
+    -destination "${XCODEBUILD_DESTINATION}" \
+    test \
+    "${XCODEBUILD_FLAGS}" \
+    | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"
 
 time xcodebuild \
     -workspace CFStreamTests.xcworkspace \
     -scheme CFStreamTests_Asan \
-    -destination name="iPhone 8" \
-    test | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"
+    -destination "${XCODEBUILD_DESTINATION}" \
+    test \
+    "${XCODEBUILD_FLAGS}" \
+    | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"
 
 time xcodebuild \
     -workspace CFStreamTests.xcworkspace \
     -scheme CFStreamTests_Tsan \
-    -destination name="iPhone 8" \
-    test | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"
+    -destination "${XCODEBUILD_DESTINATION}" \
+    test \
+    "${XCODEBUILD_FLAGS}" \
+    | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"
 
 time xcodebuild \
     -workspace CFStreamTests.xcworkspace \
     -scheme CFStreamTests_Msan \
-    -destination name="iPhone 8" \
-    test | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"
+    -destination "${XCODEBUILD_DESTINATION}" \
+    test \
+    "${XCODEBUILD_FLAGS}" \
+    | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"
diff --git a/test/cpp/ios/build_and_run_tests.sh b/test/cpp/ios/build_and_run_tests.sh
@@ -29,10 +29,12 @@ XCODEBUILD_FLAGS="
   IPHONEOS_DEPLOYMENT_TARGET=9.0
 "
 
+XCODEBUILD_DESTINATION="platform=iOS Simulator,name=iPhone 11"
+
 time xcodebuild \
     -workspace Tests.xcworkspace \
     -scheme CronetTests \
-    -destination name="iPhone X" \
+    -destination "${XCODEBUILD_DESTINATION}" \
     test \
     "${XCODEBUILD_FLAGS}" \
     | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}"