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

Side by Side Diff: infra/bots/recipe_modules/skia/default_flavor.py

Issue 2191663002: Fix silently-failing compile (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | infra/bots/recipe_modules/skia/fake_specs.py » ('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 5
6 """Default flavor utils class, used for desktop builders.""" 6 """Default flavor utils class, used for desktop builders."""
7 7
8 8
9 import json 9 import json
10 10
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 make_cmd = ['make'] 137 make_cmd = ['make']
138 cmd = make_cmd + [target] 138 cmd = make_cmd + [target]
139 try: 139 try:
140 self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd, 140 self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd,
141 env=env, cwd=self._skia_api.m.path['checkout']) 141 env=env, cwd=self._skia_api.m.path['checkout'])
142 except self._skia_api.m.step.StepFailure: 142 except self._skia_api.m.step.StepFailure:
143 if self._skia_api.m.platform.is_win: 143 if self._skia_api.m.platform.is_win:
144 # The linker occasionally crashes on Windows. Try again. 144 # The linker occasionally crashes on Windows. Try again.
145 self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd, 145 self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd,
146 env=env, cwd=self._skia_api.m.path['checkout']) 146 env=env, cwd=self._skia_api.m.path['checkout'])
147 else:
148 raise
147 if 'CommandBuffer' in self._skia_api.builder_name: 149 if 'CommandBuffer' in self._skia_api.builder_name:
148 self._skia_api._run_once(self.build_command_buffer) 150 self._skia_api._run_once(self.build_command_buffer)
149 151
150 def copy_extra_build_products(self, swarming_out_dir): 152 def copy_extra_build_products(self, swarming_out_dir):
151 """Copy extra build products to specified directory. 153 """Copy extra build products to specified directory.
152 154
153 Copy flavor-specific build products to swarming_out_dir for use in test and 155 Copy flavor-specific build products to swarming_out_dir for use in test and
154 perf steps.""" 156 perf steps."""
155 if ("Win" in self._skia_api.builder_name and 157 if ("Win" in self._skia_api.builder_name and
156 "Vulkan" in self._skia_api.builder_name): 158 "Vulkan" in self._skia_api.builder_name):
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 return DeviceDirs( 233 return DeviceDirs(
232 dm_dir=self._skia_api.dm_dir, 234 dm_dir=self._skia_api.dm_dir,
233 perf_data_dir=self._skia_api.perf_data_dir, 235 perf_data_dir=self._skia_api.perf_data_dir,
234 resource_dir=self._skia_api.resource_dir, 236 resource_dir=self._skia_api.resource_dir,
235 images_dir=self._skia_api.images_dir, 237 images_dir=self._skia_api.images_dir,
236 skp_dir=self._skia_api.local_skp_dir, 238 skp_dir=self._skia_api.local_skp_dir,
237 tmp_dir=self._skia_api.tmp_dir) 239 tmp_dir=self._skia_api.tmp_dir)
238 240
239 def __repr__(self): 241 def __repr__(self):
240 return '<%s object>' % self.__class__.__name__ # pragma: no cover 242 return '<%s object>' % self.__class__.__name__ # pragma: no cover
OLDNEW
« no previous file with comments | « no previous file | infra/bots/recipe_modules/skia/fake_specs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698