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

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

Issue 2388683002: Re-enable DepsCache using GOMA_DEPS_CACHE_FILE (Closed)
Patch Set: Rebased Created 4 years, 2 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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 re 5 import re
6 6
7 from recipe_engine import recipe_api 7 from recipe_engine import recipe_api
8 from recipe_engine import util as recipe_util 8 from recipe_engine import util as recipe_util
9 9
10 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder): 10 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder):
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 '--goma-cache-dir', self.m.path['goma_cache'], 177 '--goma-cache-dir', self.m.path['goma_cache'],
178 ] 178 ]
179 179
180 # Set some buildbot info used in goma_utils. 180 # Set some buildbot info used in goma_utils.
181 for key in ['buildername', 'mastername', 'slavename', 'clobber']: 181 for key in ['buildername', 'mastername', 'slavename', 'clobber']:
182 if key in self.m.properties: 182 if key in self.m.properties:
183 args.extend([ 183 args.extend([
184 '--buildbot-%s' % key, self.m.properties[key] 184 '--buildbot-%s' % key, self.m.properties[key]
185 ]) 185 ])
186 186
187 # Use explicit goma deps cache dir if it's set in the path config. 187 safe_buildername = re.sub(r'[^a-zA-Z0-9]', '_',
188 # Otherwise use the default one inside build output directory. 188 self.m.properties['buildername']) + '.gomadeps'
189 try: 189 args.extend(['--goma-deps-cache-file', safe_buildername])
190 args.extend(['--goma-deps-cache-dir', self.m.path['goma_deps_cache']])
191 except KeyError:
192 pass
193 190
194 if self.c.compile_py.build_args: 191 if self.c.compile_py.build_args:
195 args += ['--build-args', self.c.compile_py.build_args] 192 args += ['--build-args', self.c.compile_py.build_args]
196 if self.m.properties.get('build_data_dir'): 193 if self.m.properties.get('build_data_dir'):
197 args += ['--build-data-dir', self.m.properties.get('build_data_dir')] 194 args += ['--build-data-dir', self.m.properties.get('build_data_dir')]
198 if self.c.compile_py.compiler: 195 if self.c.compile_py.compiler:
199 args += ['--compiler', self.c.compile_py.compiler] 196 args += ['--compiler', self.c.compile_py.compiler]
200 if 'goma' in self.c.compile_py.compiler: 197 if 'goma' in self.c.compile_py.compiler:
201 args += [ 198 args += [
202 '--goma-jsonstatus', self.m.json.output(), 199 '--goma-jsonstatus', self.m.json.output(),
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 })) 822 }))
826 823
827 def get_annotate_by_test_name(self, test_name): 824 def get_annotate_by_test_name(self, test_name):
828 return 'graphing' 825 return 'graphing'
829 826
830 def download_lto_plugin(self): 827 def download_lto_plugin(self):
831 return self.m.python( 828 return self.m.python(
832 name='download LTO plugin', 829 name='download LTO plugin',
833 script=self.m.path['checkout'].join( 830 script=self.m.path['checkout'].join(
834 'build', 'download_gold_plugin.py')) 831 'build', 'download_gold_plugin.py'))
OLDNEW
« no previous file with comments | « scripts/slave/compile.py ('k') | scripts/slave/recipe_modules/chromium/example.expected/basic_out_dir.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698