diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2016-02-16 09:19:50 -0500 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2016-02-16 09:19:50 -0500 |
| commit | 1324119a42b9c8cedd328b6adfa5ef00243651f6 (patch) | |
| tree | 9db54f1e411c98582e1908afb82e0aa59208dc3f /objectivec/DevTools | |
| parent | e35e24800fb8d694bdeea5fd63dc7d1b14d68723 (diff) | |
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.
Diffstat (limited to 'objectivec/DevTools')
| -rwxr-xr-x | objectivec/DevTools/full_mac_build.sh | 10 |
1 files changed, 9 insertions, 1 deletions
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 |