diff --git a/chrome/browser/chromeos/login/bluetooth_host_pairing_browsertest.cc b/chrome/browser/chromeos/login/bluetooth_host_pairing_browsertest.cc index 3f9951e54ed274..c662be27af8e34 100644 --- a/chrome/browser/chromeos/login/bluetooth_host_pairing_browsertest.cc +++ b/chrome/browser/chromeos/login/bluetooth_host_pairing_browsertest.cc @@ -161,7 +161,7 @@ class BluetoothHostPairingNoInputTest : public OobeBaseTest { pairing_chromeos::BluetoothHostPairingController* controller_ = nullptr; bluez::FakeBluetoothDeviceClient* fake_bluetooth_device_client_ = nullptr; - base::MessageLoopForUI message_loop_; + base::MessageLoop message_loop_; DISALLOW_COPY_AND_ASSIGN(BluetoothHostPairingNoInputTest); }; diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg index e914c07eb86022..c4f49c68eb5f6b 100644 --- a/infra/config/cq.cfg +++ b/infra/config/cq.cfg @@ -49,7 +49,12 @@ verifiers { builders { name: "chromeos_daisy_chromium_compile_only_ng" } builders { name: "chromium_presubmit" } builders { name: "linux_chromium_asan_rel_ng" } + # TODO(dpranke): reenable ASAP; see crbug.com/669297. + #builders { name: "linux_chromium_chromeos_compile_dbg_ng" } + builders { name: "linux_chromium_chromeos_ozone_rel_ng" } builders { name: "linux_chromium_chromeos_rel_ng" } + # TODO(dpranke): reenable ASAP; see crbug.com/669297. + #builders { name: "linux_chromium_clobber_rel_ng" } builders { name: "linux_chromium_compile_dbg_ng" } builders { name: "linux_chromium_headless_rel" } builders { name: "linux_chromium_tsan_rel_ng" } diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index d2b0b3dde92c96..7958a7a41d2667 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -499,12 +499,6 @@ }, "test": "accessibility_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "angle_unittests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -529,30 +523,6 @@ }, "test": "ash_content_unittests" }, - { - "args": [ - "--mash", - "--test-launcher-filter-file=../../testing/buildbot/filters/ash_unittests_mash.filter" - ], - "name": "ash_unittests-mash", - "override_isolate_target": "ash_unittests", - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "ash_unittests" - }, - { - "args": [ - "--mus", - "--test-launcher-filter-file=../../testing/buildbot/filters/ash_unittests_mus.filter" - ], - "name": "ash_unittests-mus", - "override_isolate_target": "ash_unittests", - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "ash_unittests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -712,8 +682,7 @@ }, { "swarming": { - "can_use_on_swarming_builders": true, - "shards": 3 + "can_use_on_swarming_builders": true }, "test": "interactive_ui_tests" }, @@ -735,36 +704,12 @@ }, "test": "latency_unittests" }, - { - "args": [ - "--ozone-platform=headless", - "--override-use-software-gl-for-tests", - "--test-launcher-filter-file=../../testing/buildbot/filters/mash.browser_tests.filter" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "hard_timeout": 900 - }, - "test": "mash_browser_tests" - }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "mash_unittests" - }, { "swarming": { "can_use_on_swarming_builders": true }, "test": "media_blink_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "media_service_unittests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -783,18 +728,6 @@ }, "test": "midi_unittests" }, - { - "args": [ - "--ozone-platform=headless", - "--override-use-software-gl-for-tests", - "--test-launcher-filter-file=../../testing/buildbot/filters/mus.browser_tests.filter" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "hard_timeout": 900 - }, - "test": "mus_browser_tests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -819,21 +752,6 @@ }, "test": "net_unittests" }, - { - "args": [ - "--ozone-platform=headless" - ], - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "ozone_gl_unittests" - }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "ozone_unittests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -846,12 +764,6 @@ }, "test": "ppapi_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "printing_unittests" - }, { "swarming": { "can_use_on_swarming_builders": true @@ -933,18 +845,6 @@ }, "test": "url_unittests" }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "views_mus_interactive_ui_tests" - }, - { - "swarming": { - "can_use_on_swarming_builders": true - }, - "test": "views_mus_unittests" - }, { "swarming": { "can_use_on_swarming_builders": true diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl index ecddc3b7310926..fa38969d6c910b 100644 --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl @@ -91,7 +91,7 @@ 'Linux ChromiumOS Builder': 'chromeos_with_codecs_release_bot', 'Linux ChromiumOS Builder (dbg)': 'chromeos_with_codecs_debug_bot', 'Linux ChromiumOS Full': 'chromeos_with_codecs_release_bot', - 'Linux ChromiumOS Ozone Builder': 'chromeos_with_codecs_release_bot', + 'Linux ChromiumOS Ozone Builder': 'chromeos_with_codecs_ozone_release_bot', }, 'chromium.fyi': { @@ -204,10 +204,10 @@ 'Linux remote_run Tester': 'release_bot', 'Mac deterministic': 'release_bot_mac_strip', 'Mac deterministic (dbg)': 'debug_bot', - 'Mojo ChromiumOS': 'chromeos_with_codecs_release_trybot', + 'Mojo ChromiumOS': 'chromeos_with_codecs_ozone_release_trybot', 'Mojo Linux': 'release_trybot', 'Mojo Windows': 'release_bot_x86_minimal_symbols', - 'Ozone Linux': 'ozone_linux_release_bot', + 'Ozone Linux': 'release_bot_ozone_linux', 'Site Isolation Android': 'android_release_bot_minimal_symbols_arm64', 'Site Isolation Linux': 'release_trybot', 'Site Isolation Win': 'release_trybot_x86', @@ -258,7 +258,7 @@ 'GPU Win x64 Builder': 'gpu_tests_deqp_gles_release_trybot', 'GPU Win x64 Builder (dbg)': 'gpu_tests_deqp_gles_debug_trybot', 'Linux ChromiumOS Builder': 'gpu_fyi_tests_chromeos_release_trybot', - 'Linux ChromiumOS Ozone Builder': 'gpu_fyi_tests_chromeos_release_trybot', + 'Linux ChromiumOS Ozone Builder': 'gpu_fyi_tests_chromeos_ozone_release_trybot', 'Linux GPU TSAN Release': 'gpu_fyi_tests_release_trybot_tsan', 'Mac GPU ASAN Release': 'gpu_fyi_tests_release_trybot_asan', }, @@ -537,7 +537,7 @@ 'linux_chromium_chromeos_compile_rel_ng': 'chromeos_with_codecs_release_trybot', 'linux_chromium_chromeos_dbg_ng': 'chromeos_with_codecs_debug_trybot', 'linux_chromium_chromeos_msan_rel_ng': 'chromeos_msan_release_bot', - 'linux_chromium_chromeos_ozone_rel_ng': 'chromeos_with_codecs_release_trybot', + 'linux_chromium_chromeos_ozone_rel_ng': 'chromeos_with_codecs_ozone_release_trybot', 'linux_chromium_chromeos_rel_ng': 'chromeos_with_codecs_release_trybot', 'linux_chromium_clobber_deterministic': 'release_trybot', 'linux_chromium_clobber_rel_ng': 'release_trybot', @@ -945,7 +945,7 @@ ], 'asan_lsan_chromeos_release_trybot': [ - 'asan', 'lsan', 'chromeos', 'release_trybot', + 'asan', 'lsan', 'chromeos', 'x11_cros', 'release_trybot', ], 'asan_lsan_edge_debug_bot': [ @@ -1013,27 +1013,35 @@ ], 'chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot': [ - 'chromeos', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', + 'chromeos', 'x11_cros', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', ], 'chromeos_msan_release_bot': [ - 'chromeos', 'msan', 'release_bot', + 'chromeos', 'x11_cros', 'msan', 'release_bot', ], 'chromeos_with_codecs_debug_bot': [ - 'chromeos_with_codecs', 'debug_bot', + 'chromeos_with_codecs', 'x11_cros', 'debug_bot', ], 'chromeos_with_codecs_debug_trybot': [ - 'chromeos_with_codecs', 'debug_trybot', + 'chromeos_with_codecs', 'x11_cros', 'debug_trybot', + ], + + 'chromeos_with_codecs_ozone_release_bot': [ + 'chromeos_with_codecs', 'ozone', 'release_bot', + ], + + 'chromeos_with_codecs_ozone_release_trybot': [ + 'chromeos_with_codecs', 'ozone', 'release_trybot', ], 'chromeos_with_codecs_release_bot': [ - 'chromeos_with_codecs', 'release_bot', + 'chromeos_with_codecs', 'x11_cros', 'release_bot', ], 'chromeos_with_codecs_release_trybot': [ - 'chromeos_with_codecs', 'release_trybot', + 'chromeos_with_codecs', 'x11_cros', 'release_trybot', ], 'clang_debug_trybot_x86': [ @@ -1160,7 +1168,7 @@ ], 'codesearch_gen_chromium_chromiumos_bot': [ - 'goma', 'clang', 'shared', 'debug', 'minimal_symbols', 'x64', 'chromeos', + 'goma', 'clang', 'shared', 'debug', 'minimal_symbols', 'x64', 'chromeos', 'ozone', ], 'codesearch_gen_chromium_linux_bot': [ @@ -1224,8 +1232,12 @@ 'debug_trybot', 'x86', ], + 'gpu_fyi_tests_chromeos_ozone_release_trybot': [ + 'gpu_fyi_tests', 'release_trybot', 'ozone', 'ozone_linux', 'system_gbm_libdrm', + ], + 'gpu_fyi_tests_chromeos_release_trybot': [ - 'gpu_fyi_tests', 'release_trybot', 'chromeos', 'system_gbm_libdrm', + 'gpu_fyi_tests', 'release_trybot', 'chromeos', 'x11_cros', ], 'gpu_fyi_tests_debug_trybot': [ @@ -1354,7 +1366,7 @@ ], 'official_goma_chromeos': [ - 'official', 'goma', 'chromeos', + 'official', 'goma', 'chromeos', 'x11_cros', ], 'official_goma_thin_lto_use_lld': [ @@ -1389,12 +1401,16 @@ 'official_optimize', 'chrome_pgo_phase_2', 'x86', ], - 'ozone_linux_release_bot': [ - 'ozone_linux', 'release_bot', + 'release_bot_ozone_linux': [ + 'release_bot', 'ozone', 'ozone_linux', + ], + + 'release_bot_fuchsia': [ + 'release_bot', 'fuchsia', ], 'ozone_linux_release_trybot': [ - 'ozone_linux', 'release_trybot', + 'release_trybot', 'ozone', 'ozone_linux', ], 'release_afl_asan': [ @@ -1417,10 +1433,6 @@ 'release_bot', 'chrome_with_codecs', ], - 'release_bot_fuchsia': [ - 'release_bot', 'fuchsia', - ], - 'release_bot_mac_new_sdk': [ 'release_bot', 'mac_new_sdk', ], @@ -1837,6 +1849,11 @@ 'gn_args': 'symbol_level=0', }, + 'x11_cros': { + # When use_ozone=false then use_x11=true. + 'gn_args': 'use_ozone=false', + }, + 'official': { 'mixins': ['official_optimize'], 'gn_args': 'is_chrome_branded=true', @@ -1850,12 +1867,16 @@ 'gn_args': 'optimize_for_fuzzing=true', }, + 'ozone': { + 'gn_args': 'use_ozone=true', + }, + 'ozone_linux': { 'gn_args': ('ozone_auto_platforms=false ozone_platform_wayland=true ' 'ozone_platform="x11" ' 'ozone_platform_x11=true ozone_platform_gbm=true ' 'enable_package_mash_services=true use_ash=false ' - 'use_xkbcommon=true use_ozone=true'), + 'use_xkbcommon=true'), }, 'fuchsia': {