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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 313 | 313 |
| 314 if R('installer'): f.AddInstallerTests(fp) | 314 if R('installer'): f.AddInstallerTests(fp) |
| 315 | 315 |
| 316 # WebKit-related tests: | 316 # WebKit-related tests: |
| 317 if R('webkit_unit'): f.AddBasicGTestTestStep('webkit_unit_tests', fp) | 317 if R('webkit_unit'): f.AddBasicGTestTestStep('webkit_unit_tests', fp) |
| 318 if R('webkit'): f.AddWebkitTests(gpu=False, | 318 if R('webkit'): f.AddWebkitTests(gpu=False, |
| 319 factory_properties=fp) | 319 factory_properties=fp) |
| 320 if R('devtools_perf'): f.AddDevToolsTests(factory_properties=fp) | 320 if R('devtools_perf'): f.AddDevToolsTests(factory_properties=fp) |
| 321 if R('webkit_gpu'): f.AddWebkitTests(gpu=True, | 321 if R('webkit_gpu'): f.AddWebkitTests(gpu=True, |
| 322 factory_properties=fp) | 322 factory_properties=fp) |
| 323 if R('webkit_lint'): f.AddWebkitLint(factory_properties=fp) | |
|
nsylvain
2012/01/25 20:19:54
if you want to run "before" the webkit tests, you
Dirk Pranke
2012/01/25 22:39:07
Ah, good to know. Yes, I want it to run before. Fi
| |
| 323 | 324 |
| 324 # Benchmark tests: | 325 # Benchmark tests: |
| 325 if R('page_cycler_moz'): | 326 if R('page_cycler_moz'): |
| 326 f.AddPageCyclerTest('page_cycler_moz', fp) | 327 f.AddPageCyclerTest('page_cycler_moz', fp) |
| 327 if R('page_cycler_morejs'): | 328 if R('page_cycler_morejs'): |
| 328 f.AddPageCyclerTest('page_cycler_morejs', fp) | 329 f.AddPageCyclerTest('page_cycler_morejs', fp) |
| 329 if R('page_cycler_intl1'): | 330 if R('page_cycler_intl1'): |
| 330 f.AddPageCyclerTest('page_cycler_intl1', fp) | 331 f.AddPageCyclerTest('page_cycler_intl1', fp) |
| 331 if R('page_cycler_intl2'): | 332 if R('page_cycler_intl2'): |
| 332 f.AddPageCyclerTest('page_cycler_intl2', fp) | 333 f.AddPageCyclerTest('page_cycler_intl2', fp) |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 870 if 'cros_deps' not in [s.name for s in self._solutions]: | 871 if 'cros_deps' not in [s.name for s in self._solutions]: |
| 871 self._solutions.append(gclient_factory.GClientSolution( | 872 self._solutions.append(gclient_factory.GClientSolution( |
| 872 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) | 873 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) |
| 873 if 'asan.DEPS' not in [s.name for s in self._solutions]: | 874 if 'asan.DEPS' not in [s.name for s in self._solutions]: |
| 874 self._solutions.append(gclient_factory.GClientSolution( | 875 self._solutions.append(gclient_factory.GClientSolution( |
| 875 'http://src.chromium.org/svn/trunk/deps/asan.DEPS', | 876 'http://src.chromium.org/svn/trunk/deps/asan.DEPS', |
| 876 'asan.DEPS')) | 877 'asan.DEPS')) |
| 877 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, | 878 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, |
| 878 options, compile_timeout, build_url, project, | 879 options, compile_timeout, build_url, project, |
| 879 factory_properties) | 880 factory_properties) |
| OLD | NEW |