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 857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 868 project=None, factory_properties=None, gclient_deps=None, | 868 project=None, factory_properties=None, gclient_deps=None, |
| 869 enable_swarm_tests=False): | 869 enable_swarm_tests=False): |
| 870 factory_properties = (factory_properties or {}).copy() | 870 factory_properties = (factory_properties or {}).copy() |
| 871 factory_properties['gclient_env'] = \ | 871 factory_properties['gclient_env'] = \ |
| 872 factory_properties.get('gclient_env', {}).copy() | 872 factory_properties.get('gclient_env', {}).copy() |
| 873 # Defaults gyp to VS2010. | 873 # Defaults gyp to VS2010. |
| 874 if self._target_platform == 'win32': | 874 if self._target_platform == 'win32': |
| 875 factory_properties['gclient_env'].setdefault('GYP_MSVS_VERSION', '2010') | 875 factory_properties['gclient_env'].setdefault('GYP_MSVS_VERSION', '2010') |
| 876 tests = tests or [] | 876 tests = tests or [] |
| 877 | 877 |
| 878 if slave_type == 'Trybot': | |
| 879 self._InitWebkitLatestFactorySettings(factory_properties) | |
|
Dirk Pranke
2013/02/07 03:42:33
Does this imply that *all* try jobs will try to pu
tony
2013/02/07 22:13:49
No, part of the changes in chromium_step.py is to
| |
| 880 | |
| 878 if factory_properties.get('needs_valgrind'): | 881 if factory_properties.get('needs_valgrind'): |
| 879 self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_VALGRIND] | 882 self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_VALGRIND] |
| 880 elif factory_properties.get('needs_tsan_win'): | 883 elif factory_properties.get('needs_tsan_win'): |
| 881 self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_TSAN_WIN] | 884 self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_TSAN_WIN] |
| 882 elif factory_properties.get('needs_drmemory'): | 885 elif factory_properties.get('needs_drmemory'): |
| 883 if 'drmemory.DEPS' not in [s.name for s in self._solutions]: | 886 if 'drmemory.DEPS' not in [s.name for s in self._solutions]: |
| 884 self._solutions.append(gclient_factory.GClientSolution( | 887 self._solutions.append(gclient_factory.GClientSolution( |
| 885 config.Master.trunk_url + | 888 config.Master.trunk_url + |
| 886 '/deps/third_party/drmemory/drmemory.DEPS', | 889 '/deps/third_party/drmemory/drmemory.DEPS', |
| 887 'drmemory.DEPS')) | 890 'drmemory.DEPS')) |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1326 build_dir=web_build_dir) | 1329 build_dir=web_build_dir) |
| 1327 chromium_cmd_obj.AddChromebotServer(factory_properties) | 1330 chromium_cmd_obj.AddChromebotServer(factory_properties) |
| 1328 chromium_cmd_obj.AddReliabilityTests(client_os) | 1331 chromium_cmd_obj.AddReliabilityTests(client_os) |
| 1329 elif slave_type == 'ChromebotClient': | 1332 elif slave_type == 'ChromebotClient': |
| 1330 chromium_cmd_obj.AddGetBuildForChromebot(client_os, | 1333 chromium_cmd_obj.AddGetBuildForChromebot(client_os, |
| 1331 extract=True, | 1334 extract=True, |
| 1332 build_url=build_url) | 1335 build_url=build_url) |
| 1333 chromium_cmd_obj.AddChromebotClient(factory_properties) | 1336 chromium_cmd_obj.AddChromebotClient(factory_properties) |
| 1334 | 1337 |
| 1335 return factory | 1338 return factory |
| OLD | NEW |