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 979978eb7faa8208281e0ea6771297b238671f46..ceb827f655472a53ea6fa5309dc0684aeb68c974 100644 |
--- a/scripts/slave/recipe_modules/chromium_tests/api.py |
+++ b/scripts/slave/recipe_modules/chromium_tests/api.py |
@@ -629,6 +629,7 @@ class ChromiumTestsApi(recipe_api.RecipeApi): |
return False, [], [] |
compile_targets = self.m.filter.compile_targets |
+ matching_exes = self.m.filter.matching_exes |
Dirk Pranke
2015/10/20 20:08:31
Why keep both compile_targets and matching_exes? W
Dirk Pranke
2015/10/20 20:10:06
(as noted in the other comment)
|
# Add crash_service to compile_targets. This is done after filtering compile |
# targets out because crash_service should always be there on windows. |
@@ -636,12 +637,14 @@ class ChromiumTestsApi(recipe_api.RecipeApi): |
if (self.m.platform.is_win and compile_targets and |
'crash_service' not in compile_targets): |
compile_targets.extend(['crash_service']) |
+ matching_exes.extend(['crash_service']) |
# Emit more detailed output useful for debugging. |
analyze_details = { |
'original_exes': original_exes, |
'original_compile_targets': original_compile_targets, |
'compile_targets': compile_targets, |
+ 'matching_exes': matching_exes, |
'self.m.filter.compile_targets': self.m.filter.compile_targets, |
'self.m.filter.matching_exes': self.m.filter.matching_exes, |
} |
@@ -653,8 +656,8 @@ class ChromiumTestsApi(recipe_api.RecipeApi): |
# Note: due to our custom logic above it's possible we end up with empty |
# results. In this case we should not compile, because doing so would |
# use default compile targets (i.e. compile too much). |
- requires_compile = bool(self.m.filter.matching_exes or compile_targets) |
- return requires_compile, self.m.filter.matching_exes, compile_targets |
+ requires_compile = bool(matching_exes or compile_targets) |
+ return requires_compile, matching_exes, compile_targets |
def configure_swarming(self, project_name, precommit, mastername=None): |
"""Configures default swarming dimensions and tags. |