Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Side by Side Diff: scripts/master/factory/chromium_factory.py

Issue 12221058: Allow trybot changes to run against WebKit@HEAD. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « scripts/master/chromium_step.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 project=None, factory_properties=None, gclient_deps=None, 882 project=None, factory_properties=None, gclient_deps=None,
883 enable_swarm_tests=False): 883 enable_swarm_tests=False):
884 factory_properties = (factory_properties or {}).copy() 884 factory_properties = (factory_properties or {}).copy()
885 factory_properties['gclient_env'] = \ 885 factory_properties['gclient_env'] = \
886 factory_properties.get('gclient_env', {}).copy() 886 factory_properties.get('gclient_env', {}).copy()
887 # Defaults gyp to VS2010. 887 # Defaults gyp to VS2010.
888 if self._target_platform == 'win32': 888 if self._target_platform == 'win32':
889 factory_properties['gclient_env'].setdefault('GYP_MSVS_VERSION', '2010') 889 factory_properties['gclient_env'].setdefault('GYP_MSVS_VERSION', '2010')
890 tests = tests or [] 890 tests = tests or []
891 891
892 # This permits simpler WebKit specific try jobs.
893 if slave_type == 'Trybot':
894 self._InitWebkitLatestFactorySettings(factory_properties)
895
892 if factory_properties.get('needs_valgrind'): 896 if factory_properties.get('needs_valgrind'):
893 self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_VALGRIND] 897 self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_VALGRIND]
894 elif factory_properties.get('needs_tsan_win'): 898 elif factory_properties.get('needs_tsan_win'):
895 self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_TSAN_WIN] 899 self._solutions[0].custom_deps_list = [self.CUSTOM_DEPS_TSAN_WIN]
896 elif factory_properties.get('needs_drmemory'): 900 elif factory_properties.get('needs_drmemory'):
897 if 'drmemory.DEPS' not in [s.name for s in self._solutions]: 901 if 'drmemory.DEPS' not in [s.name for s in self._solutions]:
898 self._solutions.append(gclient_factory.GClientSolution( 902 self._solutions.append(gclient_factory.GClientSolution(
899 config.Master.trunk_url + 903 config.Master.trunk_url +
900 '/deps/third_party/drmemory/drmemory.DEPS', 904 '/deps/third_party/drmemory/drmemory.DEPS',
901 'drmemory.DEPS')) 905 'drmemory.DEPS'))
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
1338 build_dir=web_build_dir) 1342 build_dir=web_build_dir)
1339 chromium_cmd_obj.AddChromebotServer(factory_properties) 1343 chromium_cmd_obj.AddChromebotServer(factory_properties)
1340 chromium_cmd_obj.AddReliabilityTests(client_os) 1344 chromium_cmd_obj.AddReliabilityTests(client_os)
1341 elif slave_type == 'ChromebotClient': 1345 elif slave_type == 'ChromebotClient':
1342 chromium_cmd_obj.AddGetBuildForChromebot(client_os, 1346 chromium_cmd_obj.AddGetBuildForChromebot(client_os,
1343 extract=True, 1347 extract=True,
1344 build_url=build_url) 1348 build_url=build_url)
1345 chromium_cmd_obj.AddChromebotClient(factory_properties) 1349 chromium_cmd_obj.AddChromebotClient(factory_properties)
1346 1350
1347 return factory 1351 return factory
OLDNEW
« no previous file with comments | « scripts/master/chromium_step.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698