| Index: tools/mb/mb_config.pyl
|
| diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
|
| index 7d0095ad82ebb3ce3d66c016862429c591c3a73e..f360565454aadb20b1fc771d3e0e4c5c1d6e501c 100644
|
| --- a/tools/mb/mb_config.pyl
|
| +++ b/tools/mb/mb_config.pyl
|
| @@ -27,8 +27,8 @@
|
| 'Android': 'android_without_codecs_release_bot_minimal_symbols',
|
| 'Linux x64': 'release_bot',
|
| 'Mac': 'release_bot_mac_strip',
|
| - 'Win': 'release_bot_x86',
|
| - 'Win x64': 'release_bot',
|
| + 'Win': 'release_bot_x86_minimal_symbols',
|
| + 'Win x64': 'release_bot_minimal_symbols',
|
| },
|
|
|
| 'chromium.android': {
|
| @@ -79,7 +79,7 @@
|
| },
|
|
|
| 'chromium.chromedriver': {
|
| - 'Win7': 'release_bot_x86',
|
| + 'Win7': 'release_bot_x86_minimal_symbols',
|
| 'Mac 10.6': 'release_bot',
|
| 'Linux': 'release_bot',
|
| 'Linux32': 'release_bot_x86',
|
| @@ -130,9 +130,9 @@
|
| '2': 'official_optimize_chrome_pgo_phase_2',
|
| },
|
| 'Chromium Windows Analyze': 'windows_analyze',
|
| - 'CrWin7Goma': 'release_bot_x86',
|
| + 'CrWin7Goma': 'release_bot_x86_minimal_symbols',
|
| 'CrWin7Goma(clbr)': 'shared_release_bot_x86',
|
| - 'CrWin7Goma(dbg)': 'debug_bot_x86',
|
| + 'CrWin7Goma(dbg)': 'debug_bot_x86_minimal_symbols',
|
| 'CrWin7Goma(dll)': 'shared_release_bot_x86',
|
|
|
| # if CrWinClang is modified, please update CrWinClangGoma in the same way.
|
| @@ -142,7 +142,7 @@
|
| 'CrWinClang64': 'clang_official_release_bot_minimal_symbols',
|
| 'CrWinClang64(dll)': 'clang_shared_release_bot',
|
| 'CrWinClangGoma': 'clang_official_optimize_release_bot_minimal_symbols_x86',
|
| - 'CrWinGoma': 'release_bot_x86',
|
| + 'CrWinGoma': 'release_bot_x86_minimal_symbols',
|
| 'CrWinGoma(dll)': 'shared_release_bot_x86',
|
| 'CrWinGoma(loc)': 'shared_release_bot_x86',
|
| 'ClangToTAndroidASan': 'android_clang_tot_asan',
|
| @@ -183,7 +183,7 @@
|
| 'Headless Linux (dbg)': 'headless_linux_debug_bot',
|
| 'MD Top Chrome ChromeOS material-hybrid': 'chromeos_with_codecs_debug_bot',
|
| 'MD Top Chrome ChromeOS non-material': 'chromeos_with_codecs_debug_bot',
|
| - 'MD Top Chrome Win material': 'debug_bot',
|
| + 'MD Top Chrome Win material': 'debug_bot_minimal_symbols',
|
| 'MD Top Chrome Linux material': 'debug_bot',
|
| 'LTO Linux': 'official_goma_thin_lto_use_lld',
|
| 'LTO Linux Perf': 'official_goma_thin_lto_use_lld',
|
| @@ -202,7 +202,7 @@
|
| 'Mac deterministic (dbg)': 'debug_bot',
|
| 'Mojo ChromiumOS': 'chromeos_with_codecs_ozone_release_trybot',
|
| 'Mojo Linux': 'release_bot',
|
| - 'Mojo Windows': 'release_bot_x86',
|
| + 'Mojo Windows': 'release_bot_x86_minimal_symbols',
|
| 'Ozone Linux': 'release_bot_ozone_linux',
|
| 'Site Isolation Android': 'android_release_bot_minimal_symbols_arm64',
|
| 'Site Isolation Linux': 'release_trybot',
|
| @@ -211,16 +211,16 @@
|
| 'UBSanVptr Linux': 'ubsan_vptr_release_bot',
|
| 'WebKit Linux - RandomOrder': 'release_bot',
|
| 'WebKit Mac - RandomOrder': 'release_bot',
|
| - 'WebKit Win - RandomOrder': 'release_bot_x86',
|
| + 'WebKit Win - RandomOrder': 'release_bot_x86_minimal_symbols',
|
| 'Win 10 Fast Ring': 'release_trybot',
|
| - 'Windows deterministic': 'release_bot_x86',
|
| + 'Windows deterministic': 'release_bot_x86_minimal_symbols',
|
| 'Windows Clang deterministic': 'clang_release_bot_minimal_symbols_x86',
|
| },
|
|
|
| 'chromium.goma': {
|
| 'Chromium Linux Goma Staging': 'release_bot',
|
| 'Chromium Mac Goma Staging': 'release_bot',
|
| - 'CrWinGomaStaging': 'release_bot_x86',
|
| + 'CrWinGomaStaging': 'release_bot_x86_minimal_symbols',
|
| },
|
|
|
| 'chromium.gpu': {
|
| @@ -229,8 +229,8 @@
|
| 'GPU Mac Builder (dbg)': 'gpu_tests_debug_trybot',
|
| 'GPU Linux Builder (dbg)': 'gpu_tests_debug_trybot',
|
| 'GPU Linux Builder': 'gpu_tests_release_trybot',
|
| - 'GPU Win Builder': 'gpu_tests_release_trybot_x86',
|
| - 'GPU Win Builder (dbg)': 'gpu_tests_debug_trybot_x86',
|
| + 'GPU Win Builder': 'gpu_tests_release_trybot_x86_minimal_symbols',
|
| + 'GPU Win Builder (dbg)': 'gpu_tests_debug_trybot_x86_minimal_symbols',
|
| },
|
|
|
| 'chromium.gpu.fyi': {
|
| @@ -353,7 +353,7 @@
|
| 'Android N5X Swarm': 'android_release_bot_minimal_symbols_arm64',
|
| 'Linux Swarm': 'release_bot',
|
| 'Mac Swarm': 'release_bot_mac_strip',
|
| - 'Windows Swarm': 'release_bot_x86',
|
| + 'Windows Swarm': 'release_bot_x86_minimal_symbols',
|
| },
|
|
|
| 'client.nacl.sdk': {
|
| @@ -362,8 +362,8 @@
|
| 'linux-sdk-multirel': 'release_bot',
|
| 'mac-sdk-multi': 'release_bot',
|
| 'mac-sdk-multirel': 'release_bot',
|
| - 'windows-sdk-multi': 'release_bot_x86',
|
| - 'windows-sdk-multirel': 'release_bot_x86',
|
| + 'windows-sdk-multi': 'release_bot_x86_minimal_symbols',
|
| + 'windows-sdk-multirel': 'release_bot_x86_minimal_symbols',
|
| },
|
|
|
| 'client.v8.chromium': {
|
| @@ -386,8 +386,8 @@
|
| 'V8-Blink Linux 64 - ignition': 'release_bot',
|
| 'V8-Blink Linux 64 (dbg)': 'debug_bot',
|
| 'V8-Blink Mac': 'release_bot',
|
| - 'V8-Blink Win': 'release_bot_x86',
|
| - 'Win Release (NVIDIA)': 'gpu_tests_release_trybot_x86',
|
| + 'V8-Blink Win': 'release_bot_x86_minimal_symbols',
|
| + 'Win Release (NVIDIA)': 'gpu_tests_release_trybot_x86_minimal_symbols',
|
| },
|
|
|
| 'chromium.webkit': {
|
| @@ -402,10 +402,10 @@
|
| 'WebKit Mac10.11 (retina)': 'release_bot',
|
| 'WebKit Mac10.12': 'release_bot',
|
| 'WebKit Mac10.9': 'release_bot',
|
| - 'WebKit Win Builder (dbg)': 'debug_bot_x86',
|
| - 'WebKit Win Builder': 'release_bot_x86',
|
| - 'WebKit Win x64 Builder (dbg)': 'debug_bot',
|
| - 'WebKit Win x64 Builder': 'release_bot',
|
| + 'WebKit Win Builder (dbg)': 'debug_bot_x86_minimal_symbols',
|
| + 'WebKit Win Builder': 'release_bot_x86_minimal_symbols',
|
| + 'WebKit Win x64 Builder (dbg)': 'debug_bot_minimal_symbols',
|
| + 'WebKit Win x64 Builder': 'release_bot_minimal_symbols',
|
| },
|
|
|
| 'chromium.webrtc': {
|
| @@ -425,10 +425,10 @@
|
|
|
| 'chromium.win': {
|
| # Windows bots take too long to link w/ full symbols and time out.
|
| - 'Win Builder': 'release_bot_x86',
|
| - 'Win Builder (dbg)': 'debug_bot_x86',
|
| - 'Win x64 Builder': 'release_bot',
|
| - 'Win x64 Builder (dbg)': 'debug_bot',
|
| + 'Win Builder': 'release_bot_x86_minimal_symbols',
|
| + 'Win Builder (dbg)': 'debug_bot_x86_minimal_symbols',
|
| + 'Win x64 Builder': 'release_bot_minimal_symbols',
|
| + 'Win x64 Builder (dbg)': 'debug_bot_minimal_symbols',
|
| 'WinClang64 (dbg)': 'win_clang_debug_bot',
|
| },
|
|
|
| @@ -436,7 +436,7 @@
|
| 'Linux Canary': 'debug_bot',
|
| 'Linux Dev': 'debug_bot',
|
| 'Mac Dev': 'debug_bot',
|
| - 'Windows Dev': 'debug_bot',
|
| + 'Windows Dev': 'debug_bot_minimal_symbols',
|
| },
|
|
|
| 'tryserver.blink': {
|
| @@ -457,11 +457,11 @@
|
| 'mac10.11_blink_rel': 'release_bot_minimal_symbols',
|
| 'mac10.11_retina_blink_rel': 'release_bot_minimal_symbols',
|
| 'mac10.12_blink_rel': 'release_bot_minimal_symbols',
|
| - 'win7_blink_compile_dbg': 'debug_trybot_x86',
|
| - 'win7_blink_compile_rel': 'release_bot_x86',
|
| - 'win7_blink_dbg': 'debug_trybot_x86',
|
| - 'win7_blink_rel': 'release_bot_x86',
|
| - 'win10_blink_rel': 'release_bot_x86',
|
| + 'win7_blink_compile_dbg': 'debug_trybot_x86_minimal_symbols',
|
| + 'win7_blink_compile_rel': 'release_bot_x86_minimal_symbols',
|
| + 'win7_blink_dbg': 'debug_trybot_x86_minimal_symbols',
|
| + 'win7_blink_rel': 'release_bot_x86_minimal_symbols',
|
| + 'win10_blink_rel': 'release_bot_x86_minimal_symbols',
|
| },
|
|
|
| 'tryserver.chromium.android': {
|
| @@ -626,23 +626,23 @@
|
| 'tryserver.chromium.win': {
|
| 'win10_chromium_x64_rel_ng': 'release_trybot',
|
| 'win10_chromium_x64_rel_ng_exp': 'release_trybot',
|
| - 'win8_chromium_gn_upload': 'release_bot_x86',
|
| + 'win8_chromium_gn_upload': 'release_bot_x86_minimal_symbols',
|
| 'win_x64_archive': 'release_trybot',
|
| 'win_archive': 'release_trybot_x86',
|
| - 'win_chromium_compile_dbg_ng': 'debug_trybot_x86',
|
| - 'win_chromium_compile_rel_ng': 'gpu_tests_release_trybot_x86',
|
| - 'win_chromium_dbg_ng': 'debug_trybot_x86',
|
| - 'win_chromium_rel_ng': 'gpu_tests_release_trybot_x86',
|
| + 'win_chromium_compile_dbg_ng': 'debug_trybot_x86_minimal_symbols',
|
| + 'win_chromium_compile_rel_ng': 'gpu_tests_release_trybot_x86_minimal_symbols',
|
| + 'win_chromium_dbg_ng': 'debug_trybot_x86_minimal_symbols',
|
| + 'win_chromium_rel_ng': 'gpu_tests_release_trybot_x86_minimal_symbols',
|
| 'win_chromium_syzyasan_rel': 'syzyasan_no_pch_release_x86',
|
| - 'win_chromium_x64_rel_ng': 'release_trybot',
|
| + 'win_chromium_x64_rel_ng': 'release_trybot_minimal_symbols',
|
| 'win_clang': 'win_clang_debug_bot',
|
| 'win_clang_dbg': 'clang_debug_trybot_x86',
|
| 'win_clang_rel': 'clang_official_release_trybot_x86',
|
| 'win_clang_x64_dbg': 'win_clang_debug_bot',
|
| 'win_clang_x64_rel': 'clang_official_release_trybot',
|
| 'win_mojo': 'release_trybot_x86',
|
| - 'win_nacl_sdk': 'release_bot_x86',
|
| - 'win_nacl_sdk_build': 'release_bot_x86',
|
| + 'win_nacl_sdk': 'release_bot_x86_minimal_symbols',
|
| + 'win_nacl_sdk_build': 'release_bot_x86_minimal_symbols',
|
| 'win_optional_gpu_tests_rel': 'gpu_tests_deqp_gles_release_trybot_x86',
|
| 'win_pgo': {
|
| '1': 'official_optimize_chrome_pgo_phase_1_x86',
|
| @@ -1181,6 +1181,12 @@
|
| 'debug_bot', 'x86',
|
| ],
|
|
|
| + # compiler.gni implicitly sets symbol_level=1 on Windows if goma is enabled,
|
| + # if MSVC is used. Explicitly set it here so that it's set consistently for
|
| + # both MSVC and clang.
|
| + 'debug_bot_minimal_symbols': [ 'debug_bot', 'minimal_symbols' ],
|
| + 'debug_bot_x86_minimal_symbols': [ 'debug_bot', 'x86', 'minimal_symbols' ],
|
| +
|
| 'debug_libfuzzer_asan': [
|
| 'debug', 'libfuzzer', 'asan', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl',
|
| ],
|
| @@ -1193,6 +1199,10 @@
|
| 'debug_trybot', 'x86',
|
| ],
|
|
|
| + 'debug_trybot_x86_minimal_symbols': [
|
| + 'debug_trybot', 'x86',
|
| + ],
|
| +
|
| 'gpu_fyi_tests_chromeos_ozone_release_trybot': [
|
| 'gpu_fyi_tests', 'release_trybot', 'ozone', 'ozone_linux', 'system_gbm_libdrm',
|
| ],
|
| @@ -1245,16 +1255,16 @@
|
| 'gpu_tests', 'debug_trybot',
|
| ],
|
|
|
| - 'gpu_tests_debug_trybot_x86': [
|
| - 'gpu_tests', 'debug_trybot', 'x86',
|
| + 'gpu_tests_debug_trybot_x86_minimal_symbols': [
|
| + 'gpu_tests', 'debug_trybot', 'x86', 'minimal_symbols',
|
| ],
|
|
|
| 'gpu_tests_release_trybot': [
|
| 'gpu_tests', 'release_trybot',
|
| ],
|
|
|
| - 'gpu_tests_release_trybot_x86': [
|
| - 'gpu_tests', 'release_trybot', 'x86',
|
| + 'gpu_tests_release_trybot_x86_minimal_symbols': [
|
| + 'gpu_tests', 'release_trybot', 'x86', 'minimal_symbols',
|
| ],
|
|
|
| 'gpu_tests_release_bot': [
|
| @@ -1384,14 +1394,16 @@
|
| 'release_bot', 'mac_strip',
|
| ],
|
|
|
| - 'release_bot_minimal_symbols': [
|
| - 'release_bot', 'minimal_symbols',
|
| - ],
|
| -
|
| 'release_bot_x86': [
|
| 'release_bot', 'x86',
|
| ],
|
|
|
| + # compiler.gni implicitly sets symbol_level=1 on Windows if goma is enabled,
|
| + # if MSVC is used. Explicitly set it here so that it's set consistently for
|
| + # both MSVC and clang.
|
| + 'release_bot_minimal_symbols': [ 'release_bot', 'minimal_symbols' ],
|
| + 'release_bot_x86_minimal_symbols': [ 'release_bot', 'x86', 'minimal_symbols' ],
|
| +
|
| 'release_libfuzzer_asan': [
|
| 'release', 'libfuzzer', 'asan', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing',
|
| ],
|
| @@ -1416,6 +1428,10 @@
|
| 'release_trybot',
|
| ],
|
|
|
| + 'release_trybot_minimal_symbols': [
|
| + 'release_trybot', 'minimal_symbols',
|
| + ],
|
| +
|
| 'release_trybot_arm': [
|
| 'release_trybot', 'arm',
|
| ],
|
|
|