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

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

Issue 1455563003: chromium_tests: do not add crash_service to compile targets if they already contain "all" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 5 years, 1 month 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/full_chromium_fyi_ClangToTWin.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 ast 5 import ast
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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 tests_including_triggered = list(tests) 319 tests_including_triggered = list(tests)
320 for _, builder_dict in master_dict.get('builders', {}).iteritems(): 320 for _, builder_dict in master_dict.get('builders', {}).iteritems():
321 if builder_dict.get('parent_buildername') == buildername: 321 if builder_dict.get('parent_buildername') == buildername:
322 tests_including_triggered.extend(builder_dict.get('tests', [])) 322 tests_including_triggered.extend(builder_dict.get('tests', []))
323 323
324 if bot_config.get('add_tests_as_compile_targets', True): 324 if bot_config.get('add_tests_as_compile_targets', True):
325 for t in tests_including_triggered: 325 for t in tests_including_triggered:
326 compile_targets.update(t.compile_targets(self.m)) 326 compile_targets.update(t.compile_targets(self.m))
327 327
328 # Only add crash_service when we have explicit compile targets. 328 # Only add crash_service when we have explicit compile targets.
329 if self.m.platform.is_win and compile_targets: 329 if (self.m.platform.is_win and
330 compile_targets and
331 'all' not in compile_targets):
330 compile_targets.add('crash_service') 332 compile_targets.add('crash_service')
331 333
332 # Lastly, add any targets the checkout-side test spec told us to use. 334 # Lastly, add any targets the checkout-side test spec told us to use.
333 compile_targets.update(test_spec.get(buildername, {}).get( 335 compile_targets.update(test_spec.get(buildername, {}).get(
334 'additional_compile_targets', [])) 336 'additional_compile_targets', []))
335 337
336 return sorted(compile_targets), tests_including_triggered 338 return sorted(compile_targets), tests_including_triggered
337 339
338 def transient_check(self, update_step, command): 340 def transient_check(self, update_step, command):
339 """Runs command, checking for transience if this is a try job. 341 """Runs command, checking for transience if this is a try job.
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 result_text = 'MB is enabled for this builder at this revision.' 818 result_text = 'MB is enabled for this builder at this revision.'
817 log_name = 'Builder MB-ready' 819 log_name = 'Builder MB-ready'
818 self.m.step.active_result.presentation.logs[log_name] = [result_text] 820 self.m.step.active_result.presentation.logs[log_name] = [result_text]
819 return False 821 return False
820 except (self.m.step.StepFailure, KeyError): 822 except (self.m.step.StepFailure, KeyError):
821 result_text = 'MB is not enabled for this builder at this revision.' 823 result_text = 'MB is not enabled for this builder at this revision.'
822 log_name = 'Builder NOT MB-ready' 824 log_name = 'Builder NOT MB-ready'
823 self.m.step.active_result.presentation.logs[log_name] = [result_text] 825 self.m.step.active_result.presentation.logs[log_name] = [result_text]
824 self.m.step.active_result.presentation.status = self.m.step.WARNING 826 self.m.step.active_result.presentation.status = self.m.step.WARNING
825 return True 827 return True
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTWin.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698