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..53d7554191c57ad8b7847a82ee85d3e3d6358b77 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, |
- }), |
+ 'factory': m_annotator.BaseFactory('chromium_trybot'), |
} |
b_linux_browser_asan = { |