Skip to content

GitLab

T
tangled
Commit 3e821229 authored by James Cook's avatar James Cook Committed by Commit Bot
Browse files
Options

cros: Remove mus test suites from CQ and waterfalls 

The mustash team is deprecating the current implementation of mus mode
(mojo window service on a background thread in the browser process).
We don't need to test this configuration any more.

Later CLs will clean up the test suite C++ code.

Bug: 838597
Change-Id: I1198adcb6e105f3c326f47356b5551221663ad0f
Reviewed-on: https://chromium-review.googlesource.com/1037663Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555220}
parent 92f0b09d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 270 deletions
ash/README.md
View file @ 3e821229
...@@ -24,13 +24,7 @@ Test code uses namespace ash; there is no special "test" namespace. ...@@ -24,13 +24,7 @@ Test code uses namespace ash; there is no special "test" namespace.
Mustash Mustash
---------- ----------
Ash is transitioning to use the mus window server and gpu process, found in Ash is transitioning to run as a mojo service in its own process. This change
//services/ui. Ash continues to use aura, but aura is backed by mus. Code to
support mus is found in the ash directory. There should be relatively few
differences between the pure aura and the aura-mus versions of ash. Ash can by
run in mus mode by passing the --enable-features=Mus command line flag.
Ash is also transitioning to run as a mojo service in its own process. This
means that code in chrome cannot call into ash directly, but must use the mojo means that code in chrome cannot call into ash directly, but must use the mojo
interfaces in //ash/public/interfaces. interfaces in //ash/public/interfaces.
...@@ -43,9 +37,12 @@ will only ever run in classic ash) the #include lines have "// mash-ok" ...@@ -43,9 +37,12 @@ will only ever run in classic ash) the #include lines have "// mash-ok"
appended. This makes it easier to use grep to determine which parts of chrome appended. This makes it easier to use grep to determine which parts of chrome
have not yet been adapted to mash. have not yet been adapted to mash.
Ash used to support a "mus" mode that ran the mojo window service from
//services/ui on a background thread in the browser process. This configuration
was deprecated in April 2018.
Mustash Tests Mustash Tests
----- -----
ash_unittests --enable-features=Mus runs the test suite in mus mode.
ash_unittests --enable-features=Mash runs in mash mode. Some tests will fail ash_unittests --enable-features=Mash runs in mash mode. Some tests will fail
because the underlying code has not yet been ported to work with mash. We use because the underlying code has not yet been ported to work with mash. We use
filter files to skip these tests, because it makes it easier to run the entire filter files to skip these tests, because it makes it easier to run the entire
...@@ -56,6 +53,8 @@ works under mash) you can run: ...@@ -56,6 +53,8 @@ works under mash) you can run:
`ash_unittests --enable-features=Mash --test-launcher-filter-file=testing/buildbot/filters/mash.ash_unittests.filter` `ash_unittests --enable-features=Mash --test-launcher-filter-file=testing/buildbot/filters/mash.ash_unittests.filter`
There is a similar filter file for browser_tests --enable-features=Mash.
Any new feature you add (and its tests) should work under mash. If your test Any new feature you add (and its tests) should work under mash. If your test
cannot pass under mash due to some dependency being broken you may add the test cannot pass under mash due to some dependency being broken you may add the test
to the filter file. Make sure there is a bug for the underlying issue and cite to the filter file. Make sure there is a bug for the underlying issue and cite
......
testing/buildbot/chromium.chromiumos.json
View file @ 3e821229
...@@ -863,16 +863,6 @@ ...@@ -863,16 +863,6 @@
}, },
"test": "ash_unittests" "test": "ash_unittests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "ash_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -912,19 +902,6 @@ ...@@ -912,19 +902,6 @@
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{
"args": [
"--enable-features=Mus",
"--ozone-platform=headless",
"--override-use-software-gl-for-tests"
],
"name": "mus_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "browser_tests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor", "--enable-features=VizDisplayCompositor",
...@@ -992,17 +969,6 @@ ...@@ -992,17 +969,6 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor", "--enable-features=VizDisplayCompositor",
...@@ -1021,16 +987,6 @@ ...@@ -1021,16 +987,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor", "--enable-features=VizDisplayCompositor",
...@@ -1331,16 +1287,6 @@ ...@@ -1331,16 +1287,6 @@
}, },
"test": "unit_tests" "test": "unit_tests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "unit_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
testing/buildbot/chromium.fyi.json
View file @ 3e821229
...@@ -5025,29 +5025,6 @@ ...@@ -5025,29 +5025,6 @@
}, },
"test": "ash_unittests" "test": "ash_unittests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "ash_unittests"
},
{
"args": [
"--enable-features=Mus",
"--ozone-platform=headless",
"--override-use-software-gl-for-tests"
],
"name": "mus_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "browser_tests"
},
{ {
"args": [ "args": [
"--enable-surface-synchronization" "--enable-surface-synchronization"
...@@ -5071,17 +5048,6 @@ ...@@ -5071,17 +5048,6 @@
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-surface-synchronization" "--enable-surface-synchronization"
...@@ -5105,16 +5071,6 @@ ...@@ -5105,16 +5071,6 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor", "--enable-features=VizDisplayCompositor",
...@@ -5132,16 +5088,6 @@ ...@@ -5132,16 +5088,6 @@
}, },
"test": "keyboard_unittests" "test": "keyboard_unittests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "unit_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
testing/buildbot/chromium.memory.json
View file @ 3e821229
...@@ -1733,16 +1733,6 @@ ...@@ -1733,16 +1733,6 @@
}, },
"test": "ash_unittests" "test": "ash_unittests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "ash_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1771,19 +1761,6 @@ ...@@ -1771,19 +1761,6 @@
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{
"args": [
"--enable-features=Mus",
"--ozone-platform=headless",
"--override-use-software-gl-for-tests"
],
"name": "mus_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "browser_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1845,33 +1822,12 @@ ...@@ -1845,33 +1822,12 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "content_browsertests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2105,16 +2061,6 @@ ...@@ -2105,16 +2061,6 @@
}, },
"test": "unit_tests" "test": "unit_tests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "unit_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2203,16 +2149,6 @@ ...@@ -2203,16 +2149,6 @@
}, },
"test": "ash_unittests" "test": "ash_unittests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "ash_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2238,19 +2174,6 @@ ...@@ -2238,19 +2174,6 @@
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{
"args": [
"--enable-features=Mus",
"--ozone-platform=headless",
"--override-use-software-gl-for-tests"
],
"name": "mus_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "browser_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2311,33 +2234,12 @@ ...@@ -2311,33 +2234,12 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "content_browsertests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2573,16 +2475,6 @@ ...@@ -2573,16 +2475,6 @@
}, },
"test": "unit_tests" "test": "unit_tests"
}, },
{
"args": [
"--enable-features=Mus"
],
"name": "mus_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "unit_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
testing/buildbot/gn_isolate_map.pyl
View file @ 3e821229
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
# "windowed_test_launcher" # "windowed_test_launcher"
# : the test is a gtest-based test that uses the "brave-new-test-launcher" # : the test is a gtest-based test that uses the "brave-new-test-launcher"
# from //base/test:test_support and needs to run under Xvfb if run on # from //base/test:test_support and needs to run under Xvfb if run on
# some platforms (eg. Linux Desktop, X11 CrOS and Ozone CrOS). # some platforms (eg. Linux Desktop and Ozone CrOS).
# "console_test_launcher" # "console_test_launcher"
# : the test is a gtest-based test that uses the "brave-new-test-launcher" # : the test is a gtest-based test that uses the "brave-new-test-launcher"
# from //base/test:test_support but does not need Xvfb. # from //base/test:test_support but does not need Xvfb.
......
testing/buildbot/test_suites.pyl
View file @ 3e821229
...@@ -1106,47 +1106,6 @@ ...@@ -1106,47 +1106,6 @@
'monochrome_apk_checker': {}, 'monochrome_apk_checker': {},
}, },
'linux_chromeos_rel_mus_specific_gtests': {
'mus_ash_unittests': {
'args': [
'--enable-features=Mus',
],
'test': 'ash_unittests',
},
'mus_browser_tests': {
'args': [
'--enable-features=Mus',
'--ozone-platform=headless',
'--override-use-software-gl-for-tests',
],
'swarming': {
'shards': 10,
},
'test': 'browser_tests',
},
'mus_content_unittests': {
'args': [
'--enable-features=Mus',
],
'test': 'content_unittests',
},
'mus_content_browsertests': {
'args': [
'--enable-features=Mus',
],
'swarming': {
'shards': 2,
},
'test': 'content_browsertests',
},
'mus_unit_tests': {
'args': [
'--enable-features=Mus',
],
'test': 'unit_tests',
},
},
'network_service_android_gtests': { 'network_service_android_gtests': {
'network_service_content_browsertests': { 'network_service_content_browsertests': {
'args': [ 'args': [
...@@ -2014,7 +1973,6 @@ ...@@ -2014,7 +1973,6 @@
'linux_chromeos_rel_gtests': [ 'linux_chromeos_rel_gtests': [
# This is: # This is:
# linux_chromeos_dbg_gtests # linux_chromeos_dbg_gtests
# + linux_chromeos_rel_mus_specific_gtests
# + linux_chromeos_rel_specific_gtests # + linux_chromeos_rel_specific_gtests
# + mash_chromium_gtests # + mash_chromium_gtests
'aura_gtests', 'aura_gtests',
...@@ -2026,7 +1984,6 @@ ...@@ -2026,7 +1984,6 @@
'chromium_gtests_for_non_clang_win_devices_with_graphical_output', 'chromium_gtests_for_non_clang_win_devices_with_graphical_output',
'linux_and_mac_non_clang_specific_chromium_gtests', 'linux_and_mac_non_clang_specific_chromium_gtests',
'linux_chromeos_specific_gtests', 'linux_chromeos_specific_gtests',
'linux_chromeos_rel_mus_specific_gtests',
'linux_chromeos_rel_specific_gtests', 'linux_chromeos_rel_specific_gtests',
'linux_flavor_specific_chromium_gtests', 'linux_flavor_specific_chromium_gtests',
'mash_chromium_gtests', 'mash_chromium_gtests',
...@@ -2124,7 +2081,6 @@ ...@@ -2124,7 +2081,6 @@
'chromium_gtests_for_devices_with_graphical_output', 'chromium_gtests_for_devices_with_graphical_output',
'chromium_gtests_for_non_clang_and_fyi_mac_win_devices_with_graphical_output', 'chromium_gtests_for_non_clang_and_fyi_mac_win_devices_with_graphical_output',
'chromium_gtests_for_non_clang_win_devices_with_graphical_output', 'chromium_gtests_for_non_clang_win_devices_with_graphical_output',
'linux_chromeos_rel_mus_specific_gtests',
'linux_chromeos_specific_gtests', 'linux_chromeos_specific_gtests',
'linux_flavor_specific_chromium_gtests', 'linux_flavor_specific_chromium_gtests',
'linux_incl_clang_specific_chromium_gtests', 'linux_incl_clang_specific_chromium_gtests',
...@@ -2277,7 +2233,6 @@ ...@@ -2277,7 +2233,6 @@
'mojo_chromiumos_fyi_gtests': [ 'mojo_chromiumos_fyi_gtests': [
'aura_non_clang_gtests', 'aura_non_clang_gtests',
'linux_chromeos_rel_mus_specific_gtests',
'mash_chromium_gtests', 'mash_chromium_gtests',
'mojo_chromiumos_specific_gtests', 'mojo_chromiumos_specific_gtests',
'viz_fyi_gtests', 'viz_fyi_gtests',
......
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