Skip to content

Commit

Permalink
mb: Set symbol_level to 1 on Mac/Win sanitizer builders.
Browse files Browse the repository at this point in the history
The intent of crrev.com/579533 was to use the same symbol_level on
sanitizer bots as we did before crrev.com/579330 landed by using the
default symbol level on all sanitizer bots. That was thought to be 1
on every platform (which would match the previous behaviour), but it
turns out that on Mac/Win, the default symbol_level on sanitizer bots
is 2, not 1, so the effect of crrev.com/579330 was to increase the
symbol level on those bots and crrev.com/579533 had no effect. This
change implements the intent of crrev.com/579533 by setting the symbol
level back to 1.

Bug: 869361
Change-Id: I33e572b215b389fb7d0201f5e6d11415530d86b3
Reviewed-on: https://chromium-review.googlesource.com/1164532
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581138}
  • Loading branch information
Peter Collingbourne authored and Commit Bot committed Aug 7, 2018
1 parent 2849f12 commit 4f08052
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions tools/mb/mb_config.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@
'CFI Linux CF': 'cfi_full_cfi_icall_cfi_diag_recover_release_static',
'CFI Linux ToT': 'clang_tot_cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on',
'CFI Linux (icall)': 'cfi_full_diag_icall_release_static_dcheck_always_on',
'CrWinAsan': 'asan_clang_fuzzer_static_v8_heap_release_tot',
'CrWinAsan(dll)': 'asan_clang_shared_v8_heap_release_tot',
'CrWinAsanCov': 'asan_clang_edge_fuzzer_static_v8_heap_release_tot',
'CrWinAsan': 'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release_tot',
'CrWinAsan(dll)': 'asan_clang_shared_v8_heap_minimal_symbols_release_tot',
'CrWinAsanCov': 'asan_clang_edge_fuzzer_static_v8_heap_minimal_symbols_release_tot',

'linux-win_cross-rel': 'clang_tot_win_release_cross',
'ToTAndroid': 'android_clang_tot_release_minimal_symbols',
Expand All @@ -123,7 +123,7 @@
'ToTMac': 'clang_tot_minimal_symbols_shared_release',
'ToTMacCoverage': 'clang_tot_coverage_minimal_symbols_shared_release',
'ToTMac (dbg)': 'clang_tot_shared_debug',
'ToTMacASan': 'asan_disable_nacl_clang_tot_static_release',
'ToTMacASan': 'asan_disable_nacl_clang_tot_minimal_symbols_static_release',
'ToTWin': 'clang_tot_official_minimal_symbols_static_release_x86',
'ToTWin(dbg)': 'clang_tot_shared_debug_x86',
'ToTWin(dll)': 'clang_tot_minimal_symbols_shared_release_x86_dcheck',
Expand Down Expand Up @@ -352,8 +352,8 @@
'Linux ChromiumOS MSan Builder': 'chromeos_msan_release_bot',
'Linux MSan Builder': 'msan_release_bot',
'Linux TSan Builder': 'tsan_disable_nacl_release_bot',
'Mac ASan 64 Builder': 'asan_disable_nacl_release_bot_dcheck_always_on',
'win-asan': 'asan_clang_fuzzer_static_v8_heap_release',
'Mac ASan 64 Builder': 'asan_minimal_symbols_disable_nacl_release_bot_dcheck_always_on',
'win-asan': 'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release',
},

'chromium.perf': {
Expand Down Expand Up @@ -911,28 +911,28 @@
'android_without_codecs', 'release_bot', 'minimal_symbols', 'strip_debug_info',
],

'asan_clang_edge_fuzzer_static_v8_heap_release_tot': [
'asan', 'clang_tot', 'edge', 'fuzzer', 'static', 'v8_heap', 'release',
'asan_clang_edge_fuzzer_static_v8_heap_minimal_symbols_release_tot': [
'asan', 'clang_tot', 'edge', 'fuzzer', 'static', 'v8_heap', 'minimal_symbols', 'release',
],

'asan_clang_shared_v8_heap_release_tot': [
'asan', 'clang_tot', 'shared', 'v8_heap', 'release',
'asan_clang_shared_v8_heap_minimal_symbols_release_tot': [
'asan', 'clang_tot', 'shared', 'v8_heap', 'minimal_symbols', 'release',
],

'asan_clang_fuzzer_static_v8_heap_release': [
'asan', 'fuzzer', 'static', 'v8_heap', 'release',
'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release': [
'asan', 'fuzzer', 'static', 'v8_heap', 'minimal_symbols', 'release',
],

'asan_clang_fuzzer_static_v8_heap_release_tot': [
'asan', 'clang_tot', 'fuzzer', 'static', 'v8_heap', 'release',
'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release_tot': [
'asan', 'clang_tot', 'fuzzer', 'static', 'v8_heap', 'minimal_symbols', 'release',
],

'asan_dcheck_disable_nacl_release_bot': [
'asan', 'dcheck_always_on', 'disable_nacl', 'release_bot',
],

'asan_disable_nacl_clang_tot_static_release': [
'asan', 'disable_nacl', 'clang_tot', 'static', 'release',
'asan_disable_nacl_clang_tot_minimal_symbols_static_release': [
'asan', 'disable_nacl', 'clang_tot', 'minimal_symbols', 'static', 'release',
],

'asan_disable_nacl_edge_fuzzer_v8_heap_chrome_with_codecs_release_bot': [
Expand All @@ -959,8 +959,8 @@
'asan', 'edge', 'v8_heap', 'debug_bot', 'hybrid',
],

'asan_disable_nacl_release_bot_dcheck_always_on': [
'asan', 'disable_nacl', 'release_bot', 'dcheck_always_on',
'asan_minimal_symbols_disable_nacl_release_bot_dcheck_always_on': [
'asan', 'minimal_symbols', 'disable_nacl', 'release_bot', 'dcheck_always_on',
],

'asan_fuzzer_v8_heap_chrome_with_codecs_release_bot_x86': [
Expand Down Expand Up @@ -1250,11 +1250,11 @@
],

'gpu_fyi_tests_release_trybot_asan': [
'gpu_fyi_tests', 'release_trybot', 'asan', 'disable_nacl',
'gpu_fyi_tests', 'release_trybot', 'asan', 'minimal_symbols', 'disable_nacl',
],

'gpu_fyi_tests_release_trybot_tsan': [
'gpu_fyi_tests', 'release_trybot', 'tsan', 'disable_nacl',
'gpu_fyi_tests', 'release_trybot', 'tsan', 'minimal_symbols', 'disable_nacl',
],

'gpu_fyi_tests_release_trybot_x86': [
Expand Down

0 comments on commit 4f08052

Please sign in to comment.