Skip to content

Commit 73009d7

Browse files
Bump Travis xcode version to 12.0.
Also remove 32bit tests in favor of minimum os requirement to 11.0. PiperOrigin-RevId: 371043059
1 parent b9cfc0c commit 73009d7

2 files changed

Lines changed: 15 additions & 17 deletions

File tree

.travis.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,18 @@ notifications:
2020
- mobile-devx-github-bot+travis@google.com
2121
matrix:
2222
include:
23-
- name: "Xcode 9/iPhone 5 32bit/iOS 10.3.1"
24-
osx_image: xcode9
25-
env: IOS_DESTINATION="platform=iOS Simulator,name=iPhone 5,OS=10.3.1" SANITIZER_FLAGS=""
26-
- name: "Xcode 9/iPhone 6 64bit/iOS 11.0"
27-
osx_image: xcode9
28-
env: IOS_DESTINATION="platform=iOS Simulator,name=iPhone 6,OS=11.0" SANITIZER_FLAGS=""
29-
- name: "Xcode 10/iPhone XS/iOS Latest"
30-
osx_image: xcode10
31-
env: IOS_DESTINATION="platform=iOS Simulator,name=iPhone XS,OS=latest" SANITIZER_FLAGS=""
32-
- name: "Xcode 10/iPhone XS/iOS Latest/TSAN"
33-
osx_image: xcode10
34-
env: IOS_DESTINATION="platform=iOS Simulator,name=iPhone XS,OS=latest" SANITIZER_FLAGS="-enableThreadSanitizer YES"
35-
- name: "Xcode 10/iPhone XS/iOS Latest/ASAN"
36-
osx_image: xcode10
37-
env: IOS_DESTINATION="platform=iOS Simulator,name=iPhone XS,OS=latest" SANITIZER_FLAGS="-enableAddressSanitizer YES"
23+
- name: "Xcode 12/iPhone 8/iOS 12"
24+
osx_image: xcode12
25+
env: IOS_DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=12.0" SANITIZER_FLAGS=""
26+
- name: "Xcode 12/iPhone 11/iOS Latest"
27+
osx_image: xcode12
28+
env: IOS_DESTINATION="platform=iOS Simulator,name=iPhone 11,OS=latest" SANITIZER_FLAGS=""
29+
- name: "Xcode 12/iPhone 11/iOS Latest/TSAN"
30+
osx_image: xcode12
31+
env: IOS_DESTINATION="platform=iOS Simulator,name=iPhone 11,OS=latest" SANITIZER_FLAGS="-enableThreadSanitizer YES"
32+
- name: "Xcode 12/iPhone 11/iOS Latest/ASAN"
33+
osx_image: xcode12
34+
env: IOS_DESTINATION="platform=iOS Simulator,name=iPhone 11,OS=latest" SANITIZER_FLAGS="-enableAddressSanitizer YES"
3835
install:
3936
- pod install --repo-update
4037
script:

Service/Tests/PerfTests/EDOServicePerfTest.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@
4747
*/
4848
extern uint64_t dispatch_benchmark(size_t count, void (^block)(void));
4949

50-
// Currently a single remote call should be less or equal than 15ms.
51-
static const uint64_t kRemoteInvocationThresholdInNano = 15e6;
50+
// Currently a single remote call should be less or equal than 15ms under iOS 12 and 25ms after iOS
51+
// 12.
52+
static const uint64_t kRemoteInvocationThresholdInNano = 25e6;
5253

5354
// The number of times to execute the measured blocks.
5455
static const size_t kNumOfBenchmarkExecutions = 100;

0 commit comments

Comments
 (0)