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

Unified Diff: scripts/slave/recipe_modules/chromium_tests/api.py

Issue 1871583004: Revert "Remove references to crash_service, which is no longer needed." (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
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 side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipe_modules/chromium_tests/api.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/api.py b/scripts/slave/recipe_modules/chromium_tests/api.py
index 948714717e4dbc9222c2876d4f236dc7bdec5956..24b88f953590f2e3b346fea326a51754dd5f14c1 100644
--- a/scripts/slave/recipe_modules/chromium_tests/api.py
+++ b/scripts/slave/recipe_modules/chromium_tests/api.py
@@ -322,7 +322,15 @@ class ChromiumTestsApi(recipe_api.RecipeApi):
"bot_db argument %r was not a BotConfigAndTestDB" % (bot_db)
compile_targets = bot_config.get_compile_targets(self, bot_db, tests)
- return sorted(set(compile_targets))
+
+ # Only add crash_service when we have explicit compile targets.
+ compile_targets = set(compile_targets)
+ if (self.m.platform.is_win and
+ compile_targets and
+ 'all' not in compile_targets):
+ compile_targets.add('crash_service')
+
+ return sorted(compile_targets)
def transient_check(self, update_step, command):
"""Runs command, checking for transience if this is a try job.
@@ -556,6 +564,9 @@ class ChromiumTestsApi(recipe_api.RecipeApi):
perf_setup=perf_setup,
remove_system_webview=remove_system_webview)
+ if self.m.platform.is_win:
+ self.m.chromium.crash_handler()
+
try:
yield
finally:
@@ -696,6 +707,13 @@ class ChromiumTestsApi(recipe_api.RecipeApi):
compile_targets = self.m.filter.compile_targets[:]
+ # Add crash_service to compile_targets. This is done after filtering compile
+ # targets out because crash_service should always be there on windows.
+ # TODO(akuegel): Need to solve this in a better way. crbug.com/478053
+ if (self.m.platform.is_win and compile_targets and
+ 'crash_service' not in compile_targets):
+ compile_targets.extend(['crash_service'])
+
# Emit more detailed output useful for debugging.
analyze_details = {
'test_targets': test_targets,
« no previous file with comments | « scripts/slave/recipe_modules/chromium/api.py ('k') | scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698