diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-05-29 15:17:20 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-06-15 16:12:14 -0700 |
| commit | 69cf6ed3d273fc10e8cea2caef223f4a281388f0 (patch) | |
| tree | 40da995c1a93f083ef7935d08e97535d410621e7 | |
| parent | 714b68f7b325c30d0646c8b237d65b013fb12f04 (diff) | |
| download | qtlocation-mapboxgl-69cf6ed3d273fc10e8cea2caef223f4a281388f0.tar.gz | |
Reenable iOS tests, default hardware/iOS version only for now
Use of the -destination argument to either xcodebuild or xctool
fails on Travis.
Refs #1452
| -rwxr-xr-x | scripts/ios/run.sh | 2 | ||||
| -rwxr-xr-x | scripts/ios/test.sh | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/scripts/ios/run.sh b/scripts/ios/run.sh index dbf785081b..82a701351f 100755 --- a/scripts/ios/run.sh +++ b/scripts/ios/run.sh @@ -28,5 +28,5 @@ if [[ ${PUBLISH_PLATFORM} = 'ios' ]]; then else # build & test iOS mapbox_time "run_ios_tests" \ - make ipackage-sim + make itest fi diff --git a/scripts/ios/test.sh b/scripts/ios/test.sh index 77d4d90ad3..bfaed4646d 100755 --- a/scripts/ios/test.sh +++ b/scripts/ios/test.sh @@ -4,13 +4,8 @@ set -e set -o pipefail set -u -xcodebuild \ +xctool \ -project ./test/ios/ios-tests.xcodeproj \ -scheme 'Mapbox GL Tests' \ - -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 5s,OS=7.1' \ - -destination 'platform=iOS Simulator,name=iPhone 5s,OS=latest' \ - -destination 'platform=iOS Simulator,name=iPad 2,OS=7.1' \ - -destination 'platform=iOS Simulator,name=iPad 2,OS=latest' \ - test \ - | xcpretty + -sdk iphonesimulator8.3 \ + test |