Chromium Code Reviews| 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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 327 if R('check_perms'): | 327 if R('check_perms'): |
| 328 f.AddCheckPermsStep() | 328 f.AddCheckPermsStep() |
| 329 if R('check_perms_br'): | 329 if R('check_perms_br'): |
| 330 f.AddBuildrunnerCheckPermsStep() | 330 f.AddBuildrunnerCheckPermsStep() |
| 331 if R('check_licenses'): | 331 if R('check_licenses'): |
| 332 f.AddCheckLicensesStep(fp) | 332 f.AddCheckLicensesStep(fp) |
| 333 if R('check_licenses_br'): | 333 if R('check_licenses_br'): |
| 334 f.AddBuildrunnerCheckLicensesStep(fp) | 334 f.AddBuildrunnerCheckLicensesStep(fp) |
| 335 | 335 |
| 336 # Small ("module") unit tests: | 336 # Small ("module") unit tests: |
| 337 if R('accessibility_unittests'): | |
| 338 f.AddGTestTestStep('accessibility_unittests', fp) | |
| 339 if R('accessibility_unittests_br'): | |
| 340 f.AddBuildrunnerGTest('accessibility_unittests_br', fp) | |
|
James Cook
2014/01/14 16:41:11
I think this might be a typo.
| |
| 337 if R('base_unittests'): | 341 if R('base_unittests'): |
| 338 f.AddGTestTestStep('base_unittests', fp) | 342 f.AddGTestTestStep('base_unittests', fp) |
| 339 if R('base_unittests_br'): | 343 if R('base_unittests_br'): |
| 340 f.AddBuildrunnerGTest('base_unittests', fp) | 344 f.AddBuildrunnerGTest('base_unittests', fp) |
| 341 if R('cacheinvalidation_unittests'): | 345 if R('cacheinvalidation_unittests'): |
| 342 f.AddGTestTestStep('cacheinvalidation_unittests', fp) | 346 f.AddGTestTestStep('cacheinvalidation_unittests', fp) |
| 343 if R('cacheinvalidation_br'): | 347 if R('cacheinvalidation_br'): |
| 344 f.AddBuildrunnerGTest('cacheinvalidation_unittests', fp) | 348 f.AddBuildrunnerGTest('cacheinvalidation_unittests', fp) |
| 345 if R('cast', 'cast_unittests'): | 349 if R('cast', 'cast_unittests'): |
| 346 f.AddGTestTestStep('cast_unittests', fp) | 350 f.AddGTestTestStep('cast_unittests', fp) |
| (...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1368 mode=None, slave_type='BuilderTester', options=None, | 1372 mode=None, slave_type='BuilderTester', options=None, |
| 1369 compile_timeout=1200, build_url=None, project=None, | 1373 compile_timeout=1200, build_url=None, project=None, |
| 1370 factory_properties=None): | 1374 factory_properties=None): |
| 1371 # Make sure the solution is not already there. | 1375 # Make sure the solution is not already there. |
| 1372 if 'cros_deps' not in [s.name for s in self._solutions]: | 1376 if 'cros_deps' not in [s.name for s in self._solutions]: |
| 1373 self._solutions.append(gclient_factory.GClientSolution( | 1377 self._solutions.append(gclient_factory.GClientSolution( |
| 1374 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) | 1378 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) |
| 1375 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, | 1379 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, |
| 1376 options, compile_timeout, build_url, project, | 1380 options, compile_timeout, build_url, project, |
| 1377 factory_properties) | 1381 factory_properties) |
| OLD | NEW |