Commit f9840512 authored by machenbach's avatar machenbach Committed by Commit bot

[mb] Remove lsan from x86 bots

Lsan only works with x64. This broke when landing:
https://codereview.chromium.org/2085513002/

BUG=616035
TBR=jochen@chromium.org, vogelheim@chromium.org, kjellander@chromium.org
NOTRY=true
NOTREECHECKS=true

Review-Url: https://codereview.chromium.org/2086623003
Cr-Commit-Position: refs/heads/master@{#37138}
parent 1f815749
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
#'gyp_debug_simulate_arm64': [ #'gyp_debug_simulate_arm64': [
# 'gyp', 'debug_bot', 'simulate_arm64', 'swarming'], # 'gyp', 'debug_bot', 'simulate_arm64', 'swarming'],
'gyp_debug_simulate_arm64_asan_edge': [ 'gyp_debug_simulate_arm64_asan_edge': [
'gyp', 'debug_bot', 'simulate_arm64', 'asan', 'edge'], 'gyp', 'debug_bot', 'simulate_arm64', 'asan', 'lsan', 'edge'],
'gyp_debug_simulate_mipsel_asan_edge': [ 'gyp_debug_simulate_mipsel_asan_edge': [
'gyp', 'debug_bot', 'simulate_mipsel', 'asan', 'edge'], 'gyp', 'debug_bot', 'simulate_mipsel', 'asan', 'edge'],
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
'gyp_debug_x64': [ 'gyp_debug_x64': [
'gyp', 'debug_bot', 'x64', 'swarming'], 'gyp', 'debug_bot', 'x64', 'swarming'],
'gyp_debug_x64_asan_edge': [ 'gyp_debug_x64_asan_edge': [
'gyp', 'debug_bot', 'x64', 'asan', 'edge'], 'gyp', 'debug_bot', 'x64', 'asan', 'lsan', 'edge'],
'gyp_debug_x64_custom': [ 'gyp_debug_x64_custom': [
'gyp', 'debug_bot', 'x64', 'swarming', 'v8_snapshot_custom'], 'gyp', 'debug_bot', 'x64', 'swarming', 'v8_snapshot_custom'],
'gyp_debug_x64_trybot': [ 'gyp_debug_x64_trybot': [
...@@ -174,14 +174,15 @@ ...@@ -174,14 +174,15 @@
'gyp_release_x64': [ 'gyp_release_x64': [
'gyp', 'release_bot', 'x64', 'swarming'], 'gyp', 'release_bot', 'x64', 'swarming'],
'gyp_release_x64_asan': [ 'gyp_release_x64_asan': [
'gyp', 'release_bot', 'x64', 'asan', 'swarming'], 'gyp', 'release_bot', 'x64', 'asan', 'lsan', 'swarming'],
'gyp_release_x64_asan_minimal_symbols': [ 'gyp_release_x64_asan_minimal_symbols': [
'gyp', 'release_bot', 'x64', 'asan', 'minimal_symbols', 'swarming'], 'gyp', 'release_bot', 'x64', 'asan', 'lsan', 'minimal_symbols',
'gyp_release_x64_asan_minimal_symbols_coverage': [
'gyp', 'release_bot', 'x64', 'asan', 'bb', 'coverage', 'minimal_symbols',
'swarming'], 'swarming'],
'gyp_release_x64_asan_minimal_symbols_coverage': [
'gyp', 'release_bot', 'x64', 'asan', 'bb', 'coverage', 'lsan',
'minimal_symbols', 'swarming'],
'gyp_release_x64_asan_symbolized_edge_verify_heap': [ 'gyp_release_x64_asan_symbolized_edge_verify_heap': [
'gyp', 'release_bot', 'x64', 'asan', 'edge', 'symbolized', 'gyp', 'release_bot', 'x64', 'asan', 'edge', 'lsan', 'symbolized',
'v8_verify_heap'], 'v8_verify_heap'],
'gyp_release_x64_cfi_symbolized': [ 'gyp_release_x64_cfi_symbolized': [
'gyp', 'release_bot', 'x64', 'cfi', 'swarming', 'symbolized'], 'gyp', 'release_bot', 'x64', 'cfi', 'swarming', 'symbolized'],
...@@ -225,8 +226,8 @@ ...@@ -225,8 +226,8 @@
'mixins': { 'mixins': {
'asan': { 'asan': {
'gn_args': 'clang=true asan=true lsan=true', 'gn_args': 'clang=true asan=true',
'gyp_defines': 'clang=1 asan=1 lsan=1', 'gyp_defines': 'clang=1 asan=1',
}, },
'bb': { 'bb': {
...@@ -290,6 +291,11 @@ ...@@ -290,6 +291,11 @@
'gyp': {'type': 'gyp'}, 'gyp': {'type': 'gyp'},
'lsan': {
'gn_args': 'lsan=true',
'gyp_defines': 'lsan=1',
},
'minimal_symbols': { 'minimal_symbols': {
'gn_args': 'symbol_level=1', 'gn_args': 'symbol_level=1',
'gyp_defines': 'fastbuild=1', 'gyp_defines': 'fastbuild=1',
......
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