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 os | 9 import os |
| 10 import re | 10 import re |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 475 if R('app_list_unittests_br'): | 475 if R('app_list_unittests_br'): |
| 476 f.AddBuildrunnerGTest('app_list_unittests', fp) | 476 f.AddBuildrunnerGTest('app_list_unittests', fp) |
| 477 if R('message_center_unittests'): | 477 if R('message_center_unittests'): |
| 478 f.AddGTestTestStep('message_center_unittests', fp) | 478 f.AddGTestTestStep('message_center_unittests', fp) |
| 479 if R('message_center_unittests_br'): | 479 if R('message_center_unittests_br'): |
| 480 f.AddBuildrunnerGTest('message_center_unittests', fp) | 480 f.AddBuildrunnerGTest('message_center_unittests', fp) |
| 481 if R('compositor'): | 481 if R('compositor'): |
| 482 f.AddGTestTestStep('compositor_unittests', fp) | 482 f.AddGTestTestStep('compositor_unittests', fp) |
| 483 if R('compositor_br'): | 483 if R('compositor_br'): |
| 484 f.AddBuildrunnerGTest('compositor_unittests', fp) | 484 f.AddBuildrunnerGTest('compositor_unittests', fp) |
| 485 if R('events') or R('events_unittests'): | |
|
ghost stip (do not use)
2013/11/11 22:45:55
why have both of these? let's just stick with 'eve
sadrul
2013/11/12 05:04:48
Done.
| |
| 486 f.AddGTestTestStep('events_unittests', fp) | |
| 487 if R('events_br'): | |
| 488 f.AddBuildrunnerGTest('events_unittests', fp) | |
| 485 | 489 |
| 486 # Medium-sized tests (unit and browser): | 490 # Medium-sized tests (unit and browser): |
| 487 if R('unit'): | 491 if R('unit'): |
| 488 f.AddChromeUnitTests(fp) | 492 f.AddChromeUnitTests(fp) |
| 489 if R('unit_br'): | 493 if R('unit_br'): |
| 490 f.AddBuildrunnerChromeUnitTests(fp) | 494 f.AddBuildrunnerChromeUnitTests(fp) |
| 491 # A snapshot of the "ChromeUnitTests" available for individual selection | 495 # A snapshot of the "ChromeUnitTests" available for individual selection |
| 492 if R('ipc_tests'): | 496 if R('ipc_tests'): |
| 493 f.AddGTestTestStep('ipc_tests', fp) | 497 f.AddGTestTestStep('ipc_tests', fp) |
| 494 if R('ipc_tests_br'): | 498 if R('ipc_tests_br'): |
| (...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1412 mode=None, slave_type='BuilderTester', options=None, | 1416 mode=None, slave_type='BuilderTester', options=None, |
| 1413 compile_timeout=1200, build_url=None, project=None, | 1417 compile_timeout=1200, build_url=None, project=None, |
| 1414 factory_properties=None): | 1418 factory_properties=None): |
| 1415 # Make sure the solution is not already there. | 1419 # Make sure the solution is not already there. |
| 1416 if 'cros_deps' not in [s.name for s in self._solutions]: | 1420 if 'cros_deps' not in [s.name for s in self._solutions]: |
| 1417 self._solutions.append(gclient_factory.GClientSolution( | 1421 self._solutions.append(gclient_factory.GClientSolution( |
| 1418 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) | 1422 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) |
| 1419 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, | 1423 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, |
| 1420 options, compile_timeout, build_url, project, | 1424 options, compile_timeout, build_url, project, |
| 1421 factory_properties) | 1425 factory_properties) |
| OLD | NEW |