Commit d52f2bb9 authored by Thomas Van Lenten's avatar Thomas Van Lenten

Add more Xcode versions to the objc build script.

parent 18aa2961
...@@ -268,7 +268,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then ...@@ -268,7 +268,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
-disable-concurrent-testing -disable-concurrent-testing
) )
;; ;;
9.3* ) 9.[3-4]* )
XCODEBUILD_TEST_BASE_IOS+=( XCODEBUILD_TEST_BASE_IOS+=(
# Xcode 9.3 chokes targeting iOS 8.x - http://www.openradar.me/39335367 # Xcode 9.3 chokes targeting iOS 8.x - http://www.openradar.me/39335367
-destination "platform=iOS Simulator,name=iPhone 4s,OS=9.0" # 32bit -destination "platform=iOS Simulator,name=iPhone 4s,OS=9.0" # 32bit
...@@ -277,11 +277,20 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then ...@@ -277,11 +277,20 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
-disable-concurrent-testing -disable-concurrent-testing
) )
;; ;;
10.[0-1]* )
XCODEBUILD_TEST_BASE_IOS+=(
-destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit
-destination "platform=iOS Simulator,name=iPhone 7,OS=latest" # 64bit
# 10.x also seems to often fail running destinations in parallel (with
# 32bit one include atleast)
-disable-concurrent-destination-testing
)
;;
* ) * )
echo "" echo ""
echo "ATTENTION: Time to update the simulator targets for Xcode ${XCODE_VERSION}" echo "ATTENTION: Time to update the simulator targets for Xcode ${XCODE_VERSION}"
echo "" echo ""
echo "Build aborted!" echo "ERROR: Build aborted!"
exit 2 exit 2
;; ;;
esac esac
...@@ -334,3 +343,6 @@ if [[ "${DO_OBJC_CONFORMANCE_TESTS}" == "yes" ]] ; then ...@@ -334,3 +343,6 @@ if [[ "${DO_OBJC_CONFORMANCE_TESTS}" == "yes" ]] ; then
wrapped_make -j "${NUM_MAKE_JOBS}" test_objc wrapped_make -j "${NUM_MAKE_JOBS}" test_objc
cd .. cd ..
fi fi
echo ""
echo "$(basename "${0}"): Success!"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment