Commit e2188f65 authored by Jeff Yoon's avatar Jeff Yoon Committed by Commit Bot

Reland "[ios] noncq to run tests on 14.0 simulators"

This is a reland of 297abb5a.

Added the xctest argument for iOS unit tests such that they
are triggered using the correct test runner.

Original change's description:
> [ios] noncq to run tests on 14.0 simulators
>
> ios-simulator-noncq to compile with xc12b5 as well.
> Running iOS 14.0 simulators for our test suites on xc12b5.
>
> Change-Id: I7ca5f763174c296278401ae3563894a4f5210379
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367792
> Commit-Queue: Jeff Yoon <jeffyoon@chromium.org>
> Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#800739}

Change-Id: Ieb214a3e7788a551258470c1fb076e6603343384
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2370165
Commit-Queue: Jeff Yoon <jeffyoon@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801130}
parent 1f22198b
...@@ -3040,6 +3040,9 @@ ci.mac_ios_builder( ...@@ -3040,6 +3040,9 @@ ci.mac_ios_builder(
ci.mac_ios_builder( ci.mac_ios_builder(
name = "ios-simulator-noncq", name = "ios-simulator-noncq",
caches = [
xcode_cache.x12a8189h,
],
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "ios|default", category = "ios|default",
short_name = "non", short_name = "non",
...@@ -3047,6 +3050,9 @@ ci.mac_ios_builder( ...@@ -3047,6 +3050,9 @@ ci.mac_ios_builder(
# We don't have necessary capacity to run this configuration in CQ, but it # We don't have necessary capacity to run this configuration in CQ, but it
# is part of the main waterfall # is part of the main waterfall
main_console_view = "main", main_console_view = "main",
properties = {
"xcode_build_version": "12a8189h",
},
) )
ci.memory_builder( ci.memory_builder(
......
This diff is collapsed.
This diff is collapsed.
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
# it's not possible to add one-off tests to bots. Instead they have to # it's not possible to add one-off tests to bots. Instead they have to
# be added to one of the test suites in test_suites.pyl. # be added to one of the test suites in test_suites.pyl.
# #
# Note that if you are excluding with variants, you will need to exclude
# per variant, with the identifier appended to the test suite name.
# For example, if you have ios_chrome_ui_eg2tests_module with variant
# SIM_IPHONE_6S_14_0 (identifier = "iPhone 6s 14.0"), you
# must exclude with the test name as:
# "ios_chrome_ui_eg2tests_module_iPhone 6s 14.0"
# The goal is to drive the number of exceptions to zero, to make all # The goal is to drive the number of exceptions to zero, to make all
# the bots behave similarly. # the bots behave similarly.
{ {
......
...@@ -5759,6 +5759,48 @@ ...@@ -5759,6 +5759,48 @@
} }
}, },
# This test suite takes the standard ios test suites,
# and removes failing ones from ios14-sdk-simulator.
# The result is test suites with certain tests removed,
# identified by *_noncq.
# The list of variants to use is determined by
# ios-simulator and ios-simulator-full config's 12.4
# passing sims, converted to 14.0
'ios_simulator_noncq_tests': {
'ios_common_tests': {
'mixins': [
'xctest',
],
'variants': [
'SIM_IPHONE_6S_14_0',
]
},
'ios_eg2_tests': {
'mixins': ['xcode_parallelization'],
'variants': [
'SIM_IPHONE_6S_14_0',
'SIM_IPAD_AIR_2_14_0',
'SIM_IPHONE_X_14_0',
]
},
'ios_eg2_cq_tests': {
'mixins': ['xcode_parallelization'],
'variants': [
'SIM_IPHONE_6S_14_0',
'SIM_IPAD_AIR_2_14_0',
'SIM_IPHONE_X_14_0',
]
},
'ios_screen_size_dependent_tests': {
'mixins': [
'xctest',
],
'variants': [
'SIM_IPHONE_6S_14_0',
]
}
},
'ios_simulator_tests': { 'ios_simulator_tests': {
'ios_common_tests': { 'ios_common_tests': {
'mixins': [ 'mixins': [
......
...@@ -4474,7 +4474,15 @@ ...@@ -4474,7 +4474,15 @@
'additional_compile_targets': [ 'additional_compile_targets': [
'all' 'all'
], ],
'test_suites': {}, 'mixins': [
'mac_10.15',
'mac_toolchain',
'out_dir_arg',
'xcode_12a8189h',
],
'test_suites': {
'isolated_scripts': 'ios_simulator_noncq_tests'
},
}, },
'mac-arm64-rel': { 'mac-arm64-rel': {
'additional_compile_targets': [ 'additional_compile_targets': [
......
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