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 """Utility class to build the chromium master BuildFactory's. | 5 """Utility class to build the chromium master BuildFactory's. |
6 | 6 |
7 Based on gclient_factory.py and adds chromium-specific steps.""" | 7 Based on gclient_factory.py and adds chromium-specific steps.""" |
8 | 8 |
9 import re | 9 import re |
10 | 10 |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
535 if R('ash_browsertests'): | 535 if R('ash_browsertests'): |
536 ash_fp = fp.copy() | 536 ash_fp = fp.copy() |
537 ash_fp['browser_tests_extra_options'] = ['--ash-browsertests'] | 537 ash_fp['browser_tests_extra_options'] = ['--ash-browsertests'] |
538 f.AddBuildrunnerBrowserTests(ash_fp) | 538 f.AddBuildrunnerBrowserTests(ash_fp) |
539 | 539 |
540 if self._target_platform == 'win32': | 540 if self._target_platform == 'win32': |
541 if R('installer_util_unittests'): | 541 if R('installer_util_unittests'): |
542 f.AddGTestTestStep('installer_util_unittests', fp) | 542 f.AddGTestTestStep('installer_util_unittests', fp) |
543 if R('installer_util_unittests_br'): | 543 if R('installer_util_unittests_br'): |
544 f.AddBuildrunnerGTest('installer_util_unittests', fp) | 544 f.AddBuildrunnerGTest('installer_util_unittests', fp) |
| 545 if R('setup_unittests'): |
| 546 f.AddGTestTestStep('setup_unittests', fp) |
| 547 if R('setup_unittests_br'): |
| 548 f.AddBuildrunnerGTest('setup_unittests', fp) |
545 | 549 |
546 if R('installer'): | 550 if R('installer'): |
547 f.AddInstallerTests(fp) | 551 f.AddInstallerTests(fp) |
548 if R('installer_br'): | 552 if R('installer_br'): |
549 f.AddBuildrunnerInstallerTests(fp) | 553 f.AddBuildrunnerInstallerTests(fp) |
550 | 554 |
551 if R('test_installer'): | 555 if R('test_installer'): |
552 f.AddMiniInstallerTestStep(fp) | 556 f.AddMiniInstallerTestStep(fp) |
553 if R('test_installer_br'): | 557 if R('test_installer_br'): |
554 f.AddBuildrunnerMiniInstallerTestStep(fp) | 558 f.AddBuildrunnerMiniInstallerTestStep(fp) |
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1108 options, compile_timeout, build_url, project, | 1112 options, compile_timeout, build_url, project, |
1109 factory_properties) | 1113 factory_properties) |
1110 | 1114 |
1111 def ChromiumOSASANFactory(self, target='Release', clobber=False, tests=None, | 1115 def ChromiumOSASANFactory(self, target='Release', clobber=False, tests=None, |
1112 mode=None, slave_type='BuilderTester', options=None, | 1116 mode=None, slave_type='BuilderTester', options=None, |
1113 compile_timeout=1200, build_url=None, project=None, | 1117 compile_timeout=1200, build_url=None, project=None, |
1114 factory_properties=None): | 1118 factory_properties=None): |
1115 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, | 1119 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, |
1116 options, compile_timeout, build_url, project, | 1120 options, compile_timeout, build_url, project, |
1117 factory_properties) | 1121 factory_properties) |
OLD | NEW |