| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from master import master_config | 5 from master import master_config |
| 6 from master.factory import annotator_factory | 6 from master.factory import annotator_factory |
| 7 from master.factory import chromium_factory | 7 from master.factory import chromium_factory |
| 8 | 8 |
| 9 import master_site_config | 9 import master_site_config |
| 10 | 10 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 B('Mac', 'mac_full', 'compile|testers', 'chromium_lkgr') | 70 B('Mac', 'mac_full', 'compile|testers', 'chromium_lkgr') |
| 71 F('mac_full', mac().ChromiumFactory( | 71 F('mac_full', mac().ChromiumFactory( |
| 72 clobber=True, | 72 clobber=True, |
| 73 factory_properties={'archive_build': ActiveMaster.is_production_host, | 73 factory_properties={'archive_build': ActiveMaster.is_production_host, |
| 74 'gs_bucket': 'gs://chromium-browser-continuous', | 74 'gs_bucket': 'gs://chromium-browser-continuous', |
| 75 'gs_acl': 'public-read',})) | 75 'gs_acl': 'public-read',})) |
| 76 | 76 |
| 77 B('Mac ASAN Release', 'mac_asan_rel', 'compile', 'chromium_lkgr') | 77 B('Mac ASAN Release', 'mac_asan_rel', 'compile', 'chromium_lkgr') |
| 78 F('mac_asan_rel', linux().ChromiumASANFactory( | 78 F('mac_asan_rel', linux().ChromiumASANFactory( |
| 79 clobber=True, | 79 clobber=True, |
| 80 options=['--compiler=goma-clang', '--', '-target', | 80 options=['--compiler=goma-clang', '--', '-target', 'chromium_builder_asan'], |
| 81 'chromium_builder_asan_mac'], | |
| 82 factory_properties={ | 81 factory_properties={ |
| 83 'cf_archive_build': ActiveMaster.is_production_host, | 82 'cf_archive_build': ActiveMaster.is_production_host, |
| 84 'cf_archive_name': 'asan', | 83 'cf_archive_name': 'asan', |
| 85 'gs_bucket': 'gs://chromium-browser-asan', | 84 'gs_bucket': 'gs://chromium-browser-asan', |
| 86 'gs_acl': 'public-read', | 85 'gs_acl': 'public-read', |
| 87 'gclient_env': {'GYP_DEFINES': 'asan=1 '}})) | 86 'gclient_env': {'GYP_DEFINES': 'asan=1 '}})) |
| 88 | 87 |
| 89 B('Mac ASAN Debug', 'mac_asan_dbg', 'compile', 'chromium_lkgr') | 88 B('Mac ASAN Debug', 'mac_asan_dbg', 'compile', 'chromium_lkgr') |
| 90 F('mac_asan_dbg', linux().ChromiumASANFactory( | 89 F('mac_asan_dbg', linux().ChromiumASANFactory( |
| 91 clobber=True, | 90 clobber=True, |
| 92 target='Debug', | 91 target='Debug', |
| 93 options=['--compiler=goma-clang', '--', '-target', | 92 options=['--compiler=goma-clang', '--', '-target', 'chromium_builder_asan'], |
| 94 'chromium_builder_asan_mac'], | |
| 95 factory_properties={ | 93 factory_properties={ |
| 96 'cf_archive_build': ActiveMaster.is_production_host, | 94 'cf_archive_build': ActiveMaster.is_production_host, |
| 97 'cf_archive_name': 'asan', | 95 'cf_archive_name': 'asan', |
| 98 'gs_bucket': 'gs://chromium-browser-asan', | 96 'gs_bucket': 'gs://chromium-browser-asan', |
| 99 'gs_acl': 'public-read', | 97 'gs_acl': 'public-read', |
| 100 'gclient_env': {'GYP_DEFINES': 'asan=1 component=static_library '}})) | 98 'gclient_env': {'GYP_DEFINES': 'asan=1 component=static_library '}})) |
| 101 | 99 |
| 102 ################################################################################ | 100 ################################################################################ |
| 103 ## Linux | 101 ## Linux |
| 104 ################################################################################ | 102 ################################################################################ |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 'gs_bucket': 'gs://chromium-browser-continuous', | 271 'gs_bucket': 'gs://chromium-browser-continuous', |
| 274 'perf_id': 'android-release', | 272 'perf_id': 'android-release', |
| 275 'show_perf_results': True, | 273 'show_perf_results': True, |
| 276 }, | 274 }, |
| 277 annotation_script='src/build/android/buildbot/bb_run_bot.py', | 275 annotation_script='src/build/android/buildbot/bb_run_bot.py', |
| 278 )) | 276 )) |
| 279 | 277 |
| 280 | 278 |
| 281 def Update(_config, active_master, c): | 279 def Update(_config, active_master, c): |
| 282 return helper.Update(c) | 280 return helper.Update(c) |
| OLD | NEW |