Skip to content

GitLab

T
tangled
Commit 0d389b5c authored by Justin Cohen's avatar Justin Cohen Committed by Commit Bot
Browse files
Options

[ios] Work around --enable-features overwrite in ios-slimnav bot. 

--enable-features overwrites eg_tests.json's own set of overrides, which
breaks ios_chrome_manual_fill_egtests.  Instead, directly import and
expand eg_tests.json and set --enable-features directly.

Change-Id: Ia3e03bad59c6d3e9745037666a0b16cfe3da90e7
Reviewed-on: https://chromium-review.googlesource.com/c/1335873Reviewed-by: default avatarSergey Berezin <sergeyberezin@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608096}
parent 4867cec8
Show whitespace changes
Inline Side-by-side
Showing with 313 additions and 4 deletions
ios/build/bots/chromium.fyi/ios-slimnav.json
View file @ 0d389b5c
...@@ -141,12 +141,14 @@ ...@@ -141,12 +141,14 @@
"priority": 29 "priority": 29
}, },
{ {
"include": "eg_tests.json", "app": "ios_chrome_bookmarks_egtests",
"test args": [ "test args": [
"--enable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
"shard size": 2,
"xctest": true,
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -155,12 +157,165 @@ ...@@ -155,12 +157,165 @@
"priority": 29 "priority": 29
}, },
{ {
"include": "eg_tests.json", "app": "ios_chrome_manual_fill_egtests",
"test args": [
"--enable-features=AutofillManualFallback,WebFrameMessaging,SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "11.4",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_web_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "11.4",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_settings_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "11.4",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_reading_list_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "11.4",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_showcase_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "11.4",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_bookmarks_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"shard size": 2,
"device type": "iPad Air 2",
"os": "12.1",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_manual_fill_egtests",
"test args": [
"--enable-features=AutofillManualFallback,WebFrameMessaging,SlimNavigationManager"
],
"xctest": true,
"device type": "iPad Air 2",
"os": "12.1",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_web_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "12.1",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_settings_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "12.1",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_reading_list_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "12.1",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_showcase_egtests",
"test args": [ "test args": [
"--enable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.1", "os": "12.1",
"xctest": true,
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -169,12 +324,165 @@ ...@@ -169,12 +324,165 @@
"priority": 29 "priority": 29
}, },
{ {
"include": "eg_tests.json", "app": "ios_chrome_bookmarks_egtests",
"test args": [ "test args": [
"--enable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
"shard size": 2,
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_manual_fill_egtests",
"test args": [
"--enable-features=AutofillManualFallback,WebFrameMessaging,SlimNavigationManager"
],
"xctest": true,
"device type": "iPhone X",
"os": "11.4",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_web_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "11.4",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_settings_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "11.4",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_reading_list_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "11.4",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_showcase_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "11.4",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_bookmarks_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"shard size": 2,
"device type": "iPhone X",
"os": "12.1",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_manual_fill_egtests",
"test args": [
"--enable-features=AutofillManualFallback,WebFrameMessaging,SlimNavigationManager"
],
"device type": "iPhone X",
"os": "12.1",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_web_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "12.1",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_settings_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "12.1",
"xctest": true,
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"app": "ios_chrome_reading_list_egtests",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "12.1",
"xctest": true,
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -183,12 +491,13 @@ ...@@ -183,12 +491,13 @@
"priority": 29 "priority": 29
}, },
{ {
"include": "eg_tests.json", "app": "ios_showcase_egtests",
"test args": [ "test args": [
"--enable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
"xctest": true,
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
......
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