Commit 5ecf35f1 authored by Nico Weber's avatar Nico Weber

Enable more tests on the cros memory bots.

Enable views_mus_unittests on both lsan/asan and on msan, it should pass now.

Enable ozone_unittests and wayland_client_perftests on just msan
(they don't pass on lsan/asan yet).

With this, linux_chromeos_rel_specific_gtests_asan_bringup is identical to
linux_chromeos_rel_specific_gtests and can be removed, and because of _that_,
chromium_memory_chromiumos_asan_gtests is identical to linux_chromeos_rel_gtests
and can also be removed.

As a consequence, tests added to the cros rel bots will be added to the
memory bots automatically going forward.

TBR=kbr

Bug: 843511
Bug: 855580,855588,855584,855585,855583
Change-Id: I6a28ebae4c9005ce508f8caef07679a1bb50285c
Reviewed-on: https://chromium-review.googlesource.com/1112957Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569949}
parent 3816ddd3
...@@ -4747,6 +4747,12 @@ ...@@ -4747,6 +4747,12 @@
}, },
"test": "views_mus_interactive_ui_tests" "test": "views_mus_interactive_ui_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "views_mus_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -5194,6 +5200,12 @@ ...@@ -5194,6 +5200,12 @@
}, },
"test": "ozone_gl_unittests" "test": "ozone_gl_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "ozone_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -5314,6 +5326,12 @@ ...@@ -5314,6 +5326,12 @@
}, },
"test": "views_mus_interactive_ui_tests" "test": "views_mus_interactive_ui_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "views_mus_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -5326,6 +5344,12 @@ ...@@ -5326,6 +5344,12 @@
}, },
"test": "viz_unittests" "test": "viz_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "wayland_client_perftests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
...@@ -1781,6 +1781,12 @@ ...@@ -1781,6 +1781,12 @@
'Out of Process Profiling Windows', 'Out of Process Profiling Windows',
], ],
}, },
'ozone_unittests': {
'remove_from': [
# chromium.memory
'Linux Chromium OS ASan LSan Tests (1)', # https://crbug.com/855588
],
},
'printing_unittests': { 'printing_unittests': {
'remove_from': [ 'remove_from': [
# chromium.chromiumos # chromium.chromiumos
...@@ -2601,6 +2607,12 @@ ...@@ -2601,6 +2607,12 @@
'Win7 Tests (dbg)(1)', 'Win7 Tests (dbg)(1)',
], ],
}, },
'wayland_client_perftests': {
'remove_from': [
# chromium.memory
'Linux Chromium OS ASan LSan Tests (1)', # https://crbug.com/855583
],
},
'webgl_conformance_d3d9_passthrough_tests': { 'webgl_conformance_d3d9_passthrough_tests': {
'remove_from': [ 'remove_from': [
# TODO(jdarpinian): Re-enable when http://crbug.com/841789 is fixed. # TODO(jdarpinian): Re-enable when http://crbug.com/841789 is fixed.
......
...@@ -1803,28 +1803,6 @@ ...@@ -1803,28 +1803,6 @@
'wayland_client_perftests': {}, 'wayland_client_perftests': {},
}, },
# The Chrome OS memory bots should run linux_chromeos_rel_specific_gtests,
# but currently they don't, and not all of the tests in
# linux_chromeos_rel_specific_gtests currently pass on asan and msan.
# This contains the tests that currently pass.
# TODO(thakis): Fix all failing tests, add them here, then remove this.
'linux_chromeos_rel_specific_gtests_asan_bringup': {
'chromevox_tests': {},
'exo_unittests': {},
'gl_unittests_ozone': {},
'ozone_gl_unittests': {
'args': [
'--ozone-platform=headless',
],
},
#'ozone_unittests': {}, # https://crbug.com/855580, https://crbug.com/855588
'ozone_x11_unittests': {},
'select_to_speak_extension_tests': {},
#'views_mus_unittests': {}, # https://crbug.com/855584, https://crbug.com/855585
'views_mus_interactive_ui_tests': {},
#'wayland_client_perftests': {}, # https://crbug.com/855583
},
'linux_chromeos_specific_gtests': { 'linux_chromeos_specific_gtests': {
# Chrome OS only. # Chrome OS only.
'app_list_unittests': {}, 'app_list_unittests': {},
...@@ -2490,19 +2468,6 @@ ...@@ -2490,19 +2468,6 @@
'non_linux_chromium_gtests', 'non_linux_chromium_gtests',
], ],
'chromium_memory_chromiumos_asan_gtests': [
'aura_gtests',
'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output',
'chromium_gtests_for_linux_and_chromeos_only',
'linux_chromeos_specific_gtests',
'linux_chromeos_rel_specific_gtests_asan_bringup',
'linux_flavor_specific_chromium_gtests',
'mash_chromium_gtests',
'non_android_chromium_gtests',
'non_mac_chromium_gtests',
],
'chromium_win_gtests': [ 'chromium_win_gtests': [
'aura_gtests', 'aura_gtests',
'chromium_gtests', 'chromium_gtests',
......
...@@ -2994,12 +2994,12 @@ ...@@ -2994,12 +2994,12 @@
}, },
'Linux Chromium OS ASan LSan Tests (1)': { 'Linux Chromium OS ASan LSan Tests (1)': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_memory_chromiumos_asan_gtests', 'gtest_tests': 'linux_chromeos_rel_gtests',
}, },
}, },
'Linux ChromiumOS MSan Tests': { 'Linux ChromiumOS MSan Tests': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_memory_chromiumos_asan_gtests', 'gtest_tests': 'linux_chromeos_rel_gtests',
}, },
}, },
'Linux MSan Tests': { 'Linux MSan Tests': {
......
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