From 1324119a42b9c8cedd328b6adfa5ef00243651f6 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Tue, 16 Feb 2016 09:19:50 -0500 Subject: Bump up travis to Xcode 7.2 - Update simulator versions used. - Mark the iOS tests as flaky while trying to dig out the root cause. --- objectivec/DevTools/full_mac_build.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'objectivec/DevTools') diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index 709aae0a..c8681e26 100755 --- a/objectivec/DevTools/full_mac_build.sh +++ b/objectivec/DevTools/full_mac_build.sh @@ -234,7 +234,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then echo "ERROR: Xcode 6.3/6.4 no longer supported for building, please use 7.0 or higher." 1>&2 exit 10 ;; - 7.* ) + 7.1* ) XCODEBUILD_TEST_BASE_IOS+=( -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit -destination "platform=iOS Simulator,name=iPhone 6,OS=9.0" # 64bit @@ -242,6 +242,14 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then -destination "platform=iOS Simulator,name=iPad Air,OS=9.0" # 64bit ) ;; + 7.* ) + XCODEBUILD_TEST_BASE_IOS+=( + -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit + -destination "platform=iOS Simulator,name=iPhone 6,OS=9.2" # 64bit + -destination "platform=iOS Simulator,name=iPad 2,OS=8.1" # 32bit + -destination "platform=iOS Simulator,name=iPad Air,OS=9.2" # 64bit + ) + ;; * ) echo "Time to update the simulator targets for Xcode ${XCODE_VERSION}" exit 2 -- cgit v1.2.3