Ozone: Add --enable-features=UseOzonePlatform to bot variants.
This change doesn't bring any changes for the current Ozone/Linux
config as long as the UseOzonePlatform feature is enabled by default
there and cannot be disabled. Though, when use_x11 && use_ozone will
be set together, we will need to specify what path to use by
enabling the OzonePlatform feature. That is, we are going away
from separate non-Ozone x11 and Ozone Linux configs that allow
to switch between Ozone and non-Ozone with a runtime flag instead.
Thus, to save some time and relax my testing, explicitly pass
the --enable-features=UseOzonePlatform to tests even though
UseOzonePlatform is enabled by default for OS_LINUX && USE_OZONE.
Bug: 1085700
Change-Id: I3b49b45ff23ba0ad6b2ede3e3586d3db741e88fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340962
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796324}
diff --git a/testing/buildbot/chromium.ci.json b/testing/buildbot/chromium.ci.json
index 72ef987..14802cd56 100644
--- a/testing/buildbot/chromium.ci.json
+++ b/testing/buildbot/chromium.ci.json
@@ -43943,7 +43943,8 @@
{
"args": [
"--no-xvfb",
- "--ozone-platform=headless"
+ "--ozone-platform=headless",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -43965,7 +43966,8 @@
{
"args": [
"--no-xvfb",
- "--ozone-platform=headless"
+ "--ozone-platform=headless",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -43987,7 +43989,8 @@
{
"args": [
"--no-xvfb",
- "--ozone-platform=headless"
+ "--ozone-platform=headless",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44009,7 +44012,8 @@
{
"args": [
"--no-xvfb",
- "--ozone-platform=headless"
+ "--ozone-platform=headless",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44036,7 +44040,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44059,7 +44064,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44083,6 +44089,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter"
],
"experiment_percentage": 100,
@@ -44108,7 +44115,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44132,6 +44140,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_content_browsertests.filter"
],
"merge": {
@@ -44156,7 +44165,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44179,7 +44189,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44202,7 +44213,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44225,7 +44237,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44249,6 +44262,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_views_unittests.filter"
],
"merge": {
@@ -44272,7 +44286,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44297,7 +44312,8 @@
"gtest_tests": [
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44318,7 +44334,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44340,6 +44357,7 @@
{
"args": [
"--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_browser_tests.filter"
],
"experiment_percentage": 100,
@@ -44363,7 +44381,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44385,6 +44404,7 @@
{
"args": [
"--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_content_browsertests.filter"
],
"merge": {
@@ -44407,7 +44427,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44428,7 +44449,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44449,7 +44471,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44470,7 +44493,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44491,7 +44515,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44513,6 +44538,7 @@
{
"args": [
"--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_views_unittests.filter"
],
"merge": {
@@ -44534,7 +44560,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -44555,7 +44582,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index a0f5d05..a0b12bda 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -4329,7 +4329,8 @@
{
"args": [
"--no-xvfb",
- "--ozone-platform=headless"
+ "--ozone-platform=headless",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4351,7 +4352,8 @@
{
"args": [
"--no-xvfb",
- "--ozone-platform=headless"
+ "--ozone-platform=headless",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4373,7 +4375,8 @@
{
"args": [
"--no-xvfb",
- "--ozone-platform=headless"
+ "--ozone-platform=headless",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4395,7 +4398,8 @@
{
"args": [
"--no-xvfb",
- "--ozone-platform=headless"
+ "--ozone-platform=headless",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4422,7 +4426,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4445,7 +4450,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4469,6 +4475,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter"
],
"experiment_percentage": 100,
@@ -4494,7 +4501,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4518,6 +4526,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_content_browsertests.filter"
],
"merge": {
@@ -4542,7 +4551,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4565,7 +4575,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4588,7 +4599,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4611,7 +4623,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4635,6 +4648,7 @@
"--no-xvfb",
"--use-weston",
"--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_views_unittests.filter"
],
"merge": {
@@ -4658,7 +4672,8 @@
"args": [
"--no-xvfb",
"--use-weston",
- "--ozone-platform=wayland"
+ "--ozone-platform=wayland",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4683,7 +4698,8 @@
"gtest_tests": [
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4704,7 +4720,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4726,6 +4743,7 @@
{
"args": [
"--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_browser_tests.filter"
],
"experiment_percentage": 100,
@@ -4749,7 +4767,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4771,6 +4790,7 @@
{
"args": [
"--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_content_browsertests.filter"
],
"merge": {
@@ -4793,7 +4813,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4814,7 +4835,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4835,7 +4857,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4856,7 +4879,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4877,7 +4901,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4899,6 +4924,7 @@
{
"args": [
"--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform",
"--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_views_unittests.filter"
],
"merge": {
@@ -4920,7 +4946,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
@@ -4941,7 +4968,8 @@
},
{
"args": [
- "--ozone-platform=x11"
+ "--ozone-platform=x11",
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl
index 9a28b591..b990ad9 100644
--- a/testing/buildbot/variants.pyl
+++ b/testing/buildbot/variants.pyl
@@ -13,6 +13,7 @@
'args': [
'--no-xvfb',
'--ozone-platform=headless',
+ '--enable-features=UseOzonePlatform',
],
'identifier': 'headless',
},
@@ -20,13 +21,15 @@
'args': [
'--no-xvfb',
'--use-weston',
- '--ozone-platform=wayland'
+ '--ozone-platform=wayland',
+ '--enable-features=UseOzonePlatform',
],
'identifier': 'wayland',
},
'OZONE_X11': {
'args': [
'--ozone-platform=x11',
+ '--enable-features=UseOzonePlatform',
],
'identifier': 'x11',
},
