Ignore compile_targets returned by analyze and rely completely on matching_exes

scripts/slave/recipe_modules/chromium_tests/api.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import ast
 import contextlib
 import copy
 import itertools
 import json
 
@@ skipping 611 matching lines @@
 
     if self.m.filter.matches_exclusion:
       requires_compile = bool(exes or compile_targets)
       return requires_compile, exes, compile_targets
 
     if not self.m.filter.result:
       # Patch does not require compile.
       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? We should just return a single
list (matching_exes).

[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.
     # 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'])
+      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,
     }
     with contextlib.closing(recipe_util.StringListIO()) as listio:
       json.dump(analyze_details, listio, indent=2, sort_keys=True)
     step_result = self.m.step.active_result
     step_result.presentation.logs['analyze_details'] = listio.lines
 
     # 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.
 
     Args:
       project_name: Lowercase name of the project, e.g. "blink", "chromium".
       precommit: Boolean flag to indicate whether the tests are running before
           the changes are commited.
     """
     self.m.swarming.set_default_dimension('pool', 'Chrome')
@@ skipping 125 matching lines @@
       result_text = 'MB is enabled for this builder at this revision.'
       log_name = 'Builder MB-ready'
       self.m.step.active_result.presentation.logs[log_name] = [result_text]
       return False
     except (self.m.step.StepFailure, KeyError):
       result_text = 'MB is not enabled for this builder at this revision.'
       log_name = 'Builder NOT MB-ready'
       self.m.step.active_result.presentation.logs[log_name] = [result_text]
       self.m.step.active_result.presentation.status = self.m.step.WARNING
       return True