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

Side by Side Diff: scripts/slave/recipe_modules/chromium_tests/api.py

Issue 2100153002: chromium_tests: remove unnecessary path component from cache checkout path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 5 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 | « no previous file | scripts/slave/recipes/chromium.expected/kitchen_path_config.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import collections 5 import collections
6 import contextlib 6 import contextlib
7 import copy 7 import copy
8 import itertools 8 import itertools
9 import json 9 import json
10 10
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 kwargs = {} 157 kwargs = {}
158 try: 158 try:
159 builder_cache = self.m.path['builder_cache'] 159 builder_cache = self.m.path['builder_cache']
160 except KeyError: # no-op if builder cache is not set up. 160 except KeyError: # no-op if builder cache is not set up.
161 pass 161 pass
162 else: 162 else:
163 sanitized_buildername = ''.join( 163 sanitized_buildername = ''.join(
164 c if c.isalnum() else '_' for c in self.m.properties['buildername']) 164 c if c.isalnum() else '_' for c in self.m.properties['buildername'])
165 checkout_path = builder_cache.join( 165 checkout_path = builder_cache.join(
166 'checkouts', sanitized_buildername) 166 bot_config.get('checkout_dir', sanitized_buildername))
167 self.m.shutil.makedirs('checkout path', checkout_path) 167 self.m.shutil.makedirs('checkout path', checkout_path)
168 kwargs['cwd'] = checkout_path 168 kwargs['cwd'] = checkout_path
169 169
170 # Bot Update re-uses the gclient configs. 170 # Bot Update re-uses the gclient configs.
171 update_step = self.m.bot_update.ensure_checkout( 171 update_step = self.m.bot_update.ensure_checkout(
172 patch_root=bot_config.get('patch_root'), 172 patch_root=bot_config.get('patch_root'),
173 root_solution_revision=root_solution_revision, 173 root_solution_revision=root_solution_revision,
174 clobber=bot_config.get('clobber', False), 174 clobber=bot_config.get('clobber', False),
175 force=force, **kwargs) 175 force=force, **kwargs)
176 assert update_step.json.output['did_run'] 176 assert update_step.json.output['did_run']
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 def get_compile_targets_for_scripts(self): 829 def get_compile_targets_for_scripts(self):
830 return self.m.python( 830 return self.m.python(
831 name='get compile targets for scripts', 831 name='get compile targets for scripts',
832 script=self.m.path['checkout'].join( 832 script=self.m.path['checkout'].join(
833 'testing', 'scripts', 'get_compile_targets.py'), 833 'testing', 'scripts', 'get_compile_targets.py'),
834 args=[ 834 args=[
835 '--output', self.m.json.output(), 835 '--output', self.m.json.output(),
836 '--', 836 '--',
837 ] + self.get_common_args_for_scripts(), 837 ] + self.get_common_args_for_scripts(),
838 step_test_data=lambda: self.m.json.test_api.output({})) 838 step_test_data=lambda: self.m.json.test_api.output({}))
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium.expected/kitchen_path_config.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698