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 buildbot.changes import svnpoller | 5 from buildbot.changes import svnpoller |
6 from buildbot.scheduler import Triggerable | 6 from buildbot.scheduler import Triggerable |
7 from buildbot.scheduler import Scheduler | 7 from buildbot.scheduler import Scheduler |
8 | 8 |
9 from common import chromium_utils | 9 from common import chromium_utils |
10 | 10 |
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
461 factory_properties={ 'needs_valgrind' : True, }) | 461 factory_properties={ 'needs_valgrind' : True, }) |
462 | 462 |
463 f_chromium_rel_linux_tsan_2 = F_LINUX( | 463 f_chromium_rel_linux_tsan_2 = F_LINUX( |
464 target='Release', | 464 target='Release', |
465 slave_type='Tester', | 465 slave_type='Tester', |
466 build_url=chromium_linux_valgrind_archive, | 466 build_url=chromium_linux_valgrind_archive, |
467 # See IMPORTANT NOTE above before adding new tests. | 467 # See IMPORTANT NOTE above before adding new tests. |
468 tests=['tsan_sql', | 468 tests=['tsan_sql', |
469 'tsan_ui_unittests', | 469 'tsan_ui_unittests', |
470 'tsan_ipc_tests', | 470 'tsan_ipc_tests', |
471 'tsan_components', | |
472 'tsan_net', | 471 'tsan_net', |
473 'tsan_unit_2_of_3', | 472 'tsan_unit_2_of_3', |
474 ], | 473 ], |
475 factory_properties={ 'needs_valgrind' : True, }) | 474 factory_properties={ 'needs_valgrind' : True, }) |
476 | 475 |
477 f_chromium_rel_linux_tsan_3 = F_LINUX( | 476 f_chromium_rel_linux_tsan_3 = F_LINUX( |
478 target='Release', | 477 target='Release', |
479 slave_type='Tester', | 478 slave_type='Tester', |
480 build_url=chromium_linux_valgrind_archive, | 479 build_url=chromium_linux_valgrind_archive, |
481 # See IMPORTANT NOTE above before adding new tests. | 480 # See IMPORTANT NOTE above before adding new tests. |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1104 | 1103 |
1105 # Adds common status and tools to this master. | 1104 # Adds common status and tools to this master. |
1106 master_utils.AutoSetupMaster(c, ActiveMaster, | 1105 master_utils.AutoSetupMaster(c, ActiveMaster, |
1107 public_html='../master.chromium/public_html', | 1106 public_html='../master.chromium/public_html', |
1108 templates=['../master.chromium/templates'], | 1107 templates=['../master.chromium/templates'], |
1109 enable_http_status_push=ActiveMaster.is_production_host) | 1108 enable_http_status_push=ActiveMaster.is_production_host) |
1110 | 1109 |
1111 if ActiveMaster.is_production_host: | 1110 if ActiveMaster.is_production_host: |
1112 import notifier_cfg | 1111 import notifier_cfg |
1113 notifier_cfg.Update(config, ActiveMaster, c) | 1112 notifier_cfg.Update(config, ActiveMaster, c) |
OLD | NEW |