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

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

Issue 1886813005: Fix uncaught exception on ios_dbg_simulator_ninja bots. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 8 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 | 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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 copy 5 import copy
6 6
7 from recipe_engine import recipe_api 7 from recipe_engine import recipe_api
8 8
9 9
10 class iOSApi(recipe_api.RecipeApi): 10 class iOSApi(recipe_api.RecipeApi):
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 test['skip'] = True 326 test['skip'] = True
327 327
328 if compile_targets: # pragma: no cover 328 if compile_targets: # pragma: no cover
329 cmd.extend(compile_targets) 329 cmd.extend(compile_targets)
330 else: 330 else:
331 return 331 return
332 332
333 use_goma = (self.compiler == 'ninja' and 333 use_goma = (self.compiler == 'ninja' and
334 ('use_goma=1' in gyp_defines or 'use_goma=true' in gn_args)) 334 ('use_goma=1' in gyp_defines or 'use_goma=true' in gn_args))
335 if use_goma: 335 if use_goma:
336 self.m.chromium.apply_config('ninja') 336 if 'without patch' not in suffix:
337 self.m.chromium.apply_config('default_compiler') 337 # TODO(crbug.com/603641):
338 self.m.chromium.apply_config('goma') 338 # Configs aren't deapplied, so we only want to apply these
339 # configs once. Really, we should refactor this so that we're
340 # not applying configs at all in build(), but rather do it
341 # in an earlier step.
342 self.m.chromium.apply_config('ninja')
343 self.m.chromium.apply_config('default_compiler')
344 self.m.chromium.apply_config('goma')
smut 2016/04/15 01:43:12 Could apply these in read_build_config.
Dirk Pranke 2016/04/15 01:46:20 I thought about that but I would have to make sure
339 self.m.chromium.compile(targets=compile_targets, 345 self.m.chromium.compile(targets=compile_targets,
340 target=build_sub_path, 346 target=build_sub_path,
341 cwd=cwd) 347 cwd=cwd)
342 else: 348 else:
343 self.m.step('compile' + suffix, cmd, cwd=cwd) 349 self.m.step('compile' + suffix, cmd, cwd=cwd)
344 350
345 def test(self, *args): 351 def test(self, *args):
346 """Runs tests as instructed by this bot's build config. 352 """Runs tests as instructed by this bot's build config.
347 353
348 Args: 354 Args:
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 self.configuration, 487 self.configuration,
482 'iossim', 488 'iossim',
483 ), 489 ),
484 'ninja': self.m.path.join( 490 'ninja': self.m.path.join(
485 'src', 491 'src',
486 build_dir, 492 build_dir,
487 '%s-%s' % (self.configuration, platform), 493 '%s-%s' % (self.configuration, platform),
488 'iossim', 494 'iossim',
489 ), 495 ),
490 }[self.compiler] 496 }[self.compiler]
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698