| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """Utility class to build the chromium master BuildFactory's. | 6 """Utility class to build the chromium master BuildFactory's. |
| 7 | 7 |
| 8 Based on gclient_factory.py and adds chromium-specific steps.""" | 8 Based on gclient_factory.py and adds chromium-specific steps.""" |
| 9 | 9 |
| 10 from buildbot.steps import trigger | 10 from buildbot.steps import trigger |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 # This function is too crowded, try to simplify it a little. | 104 # This function is too crowded, try to simplify it a little. |
| 105 def R(test): | 105 def R(test): |
| 106 return gclient_factory.ShouldRunTest(tests, test) | 106 return gclient_factory.ShouldRunTest(tests, test) |
| 107 f = factory_cmd_obj | 107 f = factory_cmd_obj |
| 108 | 108 |
| 109 # Copy perf expectations from slave to master for use later. | 109 # Copy perf expectations from slave to master for use later. |
| 110 if factory_properties.get('expectations'): | 110 if factory_properties.get('expectations'): |
| 111 f.AddUploadPerfExpectations(factory_properties) | 111 f.AddUploadPerfExpectations(factory_properties) |
| 112 | 112 |
| 113 if R('check_deps'): f.AddCheckDepsStep() | 113 if R('check_deps'): f.AddCheckDepsStep() |
| 114 if R('check_bins'): f.AddCheckBinsStep() |
| 114 if R('unit'): f.AddChromeUnitTests() | 115 if R('unit'): f.AddChromeUnitTests() |
| 115 if R('courgette'): f.AddBasicGTestTestStep('courgette_unittests') | 116 if R('courgette'): f.AddBasicGTestTestStep('courgette_unittests') |
| 116 if R('ui'): f.AddUITests(False, factory_properties) | 117 if R('ui'): f.AddUITests(False, factory_properties) |
| 117 if R('ui-single'): f.AddUITests(True, factory_properties) | 118 if R('ui-single'): f.AddUITests(True, factory_properties) |
| 118 if R('interactive_ui'): f.AddBasicGTestTestStep('interactive_ui_tests') | 119 if R('interactive_ui'): f.AddBasicGTestTestStep('interactive_ui_tests') |
| 119 if R('test_shell'): f.AddBasicGTestTestStep('test_shell_tests') | 120 if R('test_shell'): f.AddBasicGTestTestStep('test_shell_tests') |
| 120 if R('webkit'): f.AddWebkitTests(factory_properties) | 121 if R('webkit'): f.AddWebkitTests(factory_properties) |
| 121 if R('plugin'): f.AddBasicGTestTestStep('plugin_tests') | 122 if R('plugin'): f.AddBasicGTestTestStep('plugin_tests') |
| 122 if R('page_cycler'): f.AddPageCyclerTests(factory_properties) | 123 if R('page_cycler'): f.AddPageCyclerTests(factory_properties) |
| 123 if R('memory'): f.AddMemoryTests(factory_properties) | 124 if R('memory'): f.AddMemoryTests(factory_properties) |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 def CEFFactory(self, identifier, target='Release', clobber=False, | 328 def CEFFactory(self, identifier, target='Release', clobber=False, |
| 328 tests=None, mode=None, slave_type='BuilderTester', | 329 tests=None, mode=None, slave_type='BuilderTester', |
| 329 options=None, compile_timeout=1200, build_url=None, | 330 options=None, compile_timeout=1200, build_url=None, |
| 330 project=None, factory_properties=None): | 331 project=None, factory_properties=None): |
| 331 self._solutions.append(gclient_factory.GClientSolution( | 332 self._solutions.append(gclient_factory.GClientSolution( |
| 332 'http://chromiumembedded.googlecode.com/svn/trunk', | 333 'http://chromiumembedded.googlecode.com/svn/trunk', |
| 333 'src/cef')) | 334 'src/cef')) |
| 334 return self.ChromiumFactory(identifier, target, clobber, tests, mode, | 335 return self.ChromiumFactory(identifier, target, clobber, tests, mode, |
| 335 slave_type, options, compile_timeout, | 336 slave_type, options, compile_timeout, |
| 336 build_url, project, factory_properties) | 337 build_url, project, factory_properties) |
| OLD | NEW |