Chromium Code Reviews| Index: masters/master.tryserver.chromium/master.cfg |
| diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg |
| index a0559693b3fda36cd86148845ab3cf9694eed609..bec66729baa63d1f2c406bcbe38259e575e29d60 100644 |
| --- a/masters/master.tryserver.chromium/master.cfg |
| +++ b/masters/master.tryserver.chromium/master.cfg |
| @@ -1229,77 +1229,7 @@ b_win8_aura = CreateBuilder( |
| b_linux_asan = { |
| 'name': 'linux_asan', |
| - 'factory': m_chromium_linux.ChromiumASANFactory( |
| - slave_type='Trybot', |
| - options=[ |
| - '--build-tool=ninja', |
| - '--compiler=goma-clang', |
| - 'accessibility_unittests', |
| - 'base_unittests', |
| - 'cacheinvalidation_unittests', |
| - 'cast_unittests', |
| - 'cc_unittests', |
| - 'components_unittests', |
| - 'content_unittests', |
| - 'crypto_unittests', |
| - 'device_unittests', |
| - 'display_unittests', |
| - 'gcm_unit_tests', |
| - 'gfx_unittests', |
| - 'google_apis_unittests', |
| - 'gpu_unittests', |
| - 'ipc_tests', |
| - 'jingle_unittests', |
| - 'media_unittests', |
| - 'net_unittests', |
| - 'ppapi_unittests', |
| - 'printing_unittests', |
| - 'remoting_unittests', |
| - 'sandbox_linux_unittests', |
| - 'sql_unittests', |
| - 'sync_unit_tests', |
| - 'ui_unittests', |
| - 'unit_tests', |
| - 'url_unittests', |
| - ], |
| - tests=[ |
| - 'accessibility_unittests', |
| - 'base_unittests', |
| - 'cacheinvalidation_unittests', |
| - 'cc_unittests', |
| - 'components_unittests', |
| - 'content_unittests', |
| - 'crypto_unittests', |
| - 'device_unittests', |
| - 'display_unittests', |
| - 'gcm_unit_tests', |
| - 'gfx_unittests', |
| - 'google_apis_unittests', |
| - 'gpu', |
| - 'ipc_tests', |
| - 'jingle', |
| - 'media', |
| - 'net', |
| - 'ppapi_unittests', |
| - 'printing', |
| - 'remoting', |
| - 'sandbox_linux_unittests', |
| - 'sql_unittests', |
| - 'sync_unit_tests', |
| - 'ui_unittests', |
| - 'unit_tests', |
| - 'url_unittests', |
| - ], |
| - factory_properties={ |
| - 'asan': True, # Used by runtest.py. |
| - 'cluster_size': 1, |
| - 'gclient_env': { |
| - 'GYP_GENERATORS': 'ninja', |
| - 'GYP_DEFINES': 'asan=1 lsan=1 use_allocator=none fastbuild=0', |
| - }, |
| - 'lsan': True, |
| - 'sharded_tests': sharded_tests, |
|
cmumford
2014/08/08 21:12:47
Note: I can't see a place to put these values in t
Michael Achenbach
2014/08/09 07:57:35
asan and lsan are now defined through gyp. The clu
|
| - }), |
| + 'factory': m_annotator.BaseFactory('chromium_asan'), |
|
Michael Achenbach
2014/08/09 07:57:35
Here should go the recipe name. Right now you use
cmumford
2014/08/13 17:17:07
So I'm confused by your comment because I wasn't u
|
| } |
| b_linux_browser_asan = { |