Skip to content

GitLab

T
tangled
Commit 7f659a5f authored by Nico Weber's avatar Nico Weber Committed by Commit Bot
Browse files
Options

merge aura_non_clang_gtests into aura_gtests, run... 

merge aura_non_clang_gtests into aura_gtests, run linux_and_mac_specific_chromium_gtests on asan bots too

This adds keyboard_unittests and snapshot_unittests to the *san bots, where
they were omitted unintentionally. It also adds keyboard_unittests to the
clang and fyi bots.

This is part of an effort to reduce the number of test configurations.
Originally reviewed as part of https://chromium-review.googlesource.com/1061795,
which I'm now landing in smaller pieces.

TBR=kbr

Bug: 843511
Change-Id: I11d8982c26888d56834c18a5f83ad57c4c29126c
Reviewed-on: https://chromium-review.googlesource.com/1067167
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560295}
parent 61cd791d
Hide whitespace changes
Inline Side-by-side
Showing with 300 additions and 19 deletions
testing/buildbot/chromium.clang.json
View file @ 7f659a5f
......@@ -250,6 +250,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -681,6 +687,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1075,6 +1087,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1467,6 +1485,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1852,6 +1876,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2244,6 +2274,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2636,6 +2672,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -3028,6 +3070,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -3420,6 +3468,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -6919,6 +6973,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -7340,6 +7400,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -7749,6 +7815,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -8158,6 +8230,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
......@@ -8562,6 +8640,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -9777,6 +9861,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -10169,6 +10259,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -10561,6 +10657,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -10953,6 +11055,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -11345,6 +11453,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -11737,6 +11851,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -12129,6 +12249,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -12521,6 +12647,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -12913,6 +13045,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -13305,6 +13443,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -13703,6 +13847,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -14241,6 +14391,17 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Windows-10"
}
]
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
......
testing/buildbot/chromium.fyi.json
View file @ 7f659a5f
......@@ -572,6 +572,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1003,6 +1009,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -3851,6 +3863,12 @@
},
"test": "ash_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "aura_unittests"
},
{
"args": [
"--enable-surface-synchronization"
......@@ -3874,6 +3892,12 @@
},
"test": "browser_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "compositor_unittests"
},
{
"args": [
"--enable-surface-synchronization"
......@@ -3929,6 +3953,12 @@
"can_use_on_swarming_builders": true
},
"test": "wayland_client_perftests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "wm_unittests"
}
],
"isolated_scripts": [
......@@ -4952,6 +4982,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -5761,6 +5797,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -6452,6 +6494,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
......
testing/buildbot/chromium.memory.json
View file @ 7f659a5f
......@@ -1051,6 +1051,16 @@
},
"test": "jingle_unittests"
},
{
"args": [
"--test-launcher-batch-limit=1",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"args": [
"--test-launcher-batch-limit=1",
......@@ -1222,6 +1232,16 @@
},
"test": "skia_unittests"
},
{
"args": [
"--test-launcher-batch-limit=1",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "snapshot_unittests"
},
{
"args": [
"--test-launcher-batch-limit=1",
......@@ -1626,6 +1646,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1734,6 +1760,12 @@
},
"test": "skia_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "snapshot_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2050,6 +2082,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2504,6 +2542,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -2929,6 +2973,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -3031,6 +3081,12 @@
},
"test": "skia_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "snapshot_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -3324,6 +3380,12 @@
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "keyboard_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -3427,6 +3489,12 @@
},
"test": "skia_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "snapshot_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -3771,6 +3839,12 @@
},
"test": "skia_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "snapshot_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......
testing/buildbot/test_suites.pyl
View file @ 7f659a5f
......@@ -296,12 +296,8 @@
'aura_gtests': {
'aura_unittests': {},
'compositor_unittests': {},
'wm_unittests': {},
},
'aura_non_clang_gtests': {
# TODO(kbr): merge back into 'aura_gtests'.
'keyboard_unittests': {},
'wm_unittests': {},
},
'cast_audio_specific_chromium_gtests': {
......@@ -985,8 +981,7 @@
},
},
'linux_and_mac_non_clang_specific_chromium_gtests': {
# TODO(kbr): merge back into linux_and_mac_specific_chromium_gtests.
'linux_and_mac_specific_chromium_gtests': {
'snapshot_unittests': {},
},
......@@ -1879,13 +1874,12 @@
'chromium_linux_gtests': [
'aura_gtests',
'aura_non_clang_gtests',
'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output',
'chromium_gtests_for_linux_and_chromeos_only',
'chromium_gtests_for_non_clang_and_fyi_mac_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_specific_chromium_gtests',
'linux_flavor_specific_chromium_gtests',
'linux_incl_clang_specific_chromium_gtests',
'linux_specific_chromium_gtests',
......@@ -1914,13 +1908,12 @@
# - non_android_and_cast_and_chromeos_chromium_gtests
# + linux_chromeos_specific_gtests
'aura_gtests',
'aura_non_clang_gtests',
'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output',
'chromium_gtests_for_linux_and_chromeos_only',
'chromium_gtests_for_non_clang_and_fyi_mac_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_specific_chromium_gtests',
'linux_chromeos_specific_gtests',
'linux_flavor_specific_chromium_gtests',
'non_android_chromium_gtests',
......@@ -1938,13 +1931,12 @@
# + linux_chromeos_rel_specific_gtests
# + mash_chromium_gtests
'aura_gtests',
'aura_non_clang_gtests',
'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output',
'chromium_gtests_for_linux_and_chromeos_only',
'chromium_gtests_for_non_clang_and_fyi_mac_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_specific_chromium_gtests',
'linux_chromeos_specific_gtests',
'linux_chromeos_rel_specific_gtests',
'linux_flavor_specific_chromium_gtests',
......@@ -1990,7 +1982,7 @@
'chromium_gtests',
'chromium_gtests_for_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_specific_chromium_gtests',
'mac_specific_chromium_gtests',
'non_android_chromium_gtests',
'non_android_and_cast_and_chromeos_and_clang_android_mac_win_chromium_gtests',
......@@ -2010,7 +2002,7 @@
'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_win_devices_with_graphical_output',
'linux_and_mac_non_clang_specific_chromium_gtests',
'linux_and_mac_specific_chromium_gtests',
'mac_specific_chromium_gtests',
'non_android_chromium_gtests',
'non_android_and_cast_and_chromeos_and_clang_android_mac_win_chromium_gtests',
......@@ -2051,6 +2043,7 @@
'chromium_gtests_for_non_clang_win_devices_with_graphical_output',
'clang_gl_gtests',
'interactive_ui_tests_gtests',
'linux_and_mac_specific_chromium_gtests',
'linux_flavor_specific_chromium_gtests',
'linux_incl_clang_specific_chromium_gtests',
'non_android_and_cast_and_chromeos_chromium_gtests',
......@@ -2068,6 +2061,7 @@
'chromium_gtests_for_non_clang_and_fyi_mac_win_devices_with_graphical_output',
'chromium_gtests_for_non_clang_win_devices_with_graphical_output',
'interactive_ui_tests_gtests',
'linux_and_mac_specific_chromium_gtests',
'non_android_and_cast_and_chromeos_chromium_gtests',
'non_android_and_clang_linux_mac_win_chromium_gtests',
'non_android_and_clang_win_chromium_gtests',
......@@ -2100,7 +2094,6 @@
'chromium_win_fyi_gtests': [
'aura_gtests',
'aura_non_clang_gtests',
'chrome_cleaner_gtests',
'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output',
......@@ -2124,7 +2117,6 @@
'chromium_win_gtests': [
'aura_gtests',
'aura_non_clang_gtests',
'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output',
'chromium_gtests_for_non_clang_and_fyi_mac_win_devices_with_graphical_output',
......@@ -2163,7 +2155,7 @@
],
'mojo_chromiumos_fyi_gtests': [
'aura_non_clang_gtests',
'aura_gtests',
'mash_chromium_gtests',
'mojo_chromiumos_specific_gtests',
'viz_fyi_gtests',
......
ui/snapshot/snapshot_aura_unittest.cc
View file @ 7f659a5f
......@@ -184,7 +184,13 @@ class SnapshotAuraTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(SnapshotAuraTest);
};
TEST_F(SnapshotAuraTest, FullScreenWindow) {
#if defined(THREAD_SANITIZER)
// https://crbug.com/845173
#define MAYBE_FullScreenWindow DISABLED_FullScreenWindow
#else
#define MAYBE_FullScreenWindow FullScreenWindow
#endif
TEST_F(SnapshotAuraTest, MAYBE_FullScreenWindow) {
SetupTestWindow(root_window()->bounds());
WaitForDraw();
......
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