Use simpler "analyze" logic for chromium_trybot recipe on non-Windows

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 contextlib
 import copy
 import json
 
 from infra.libs.infra_types import freeze, thaw
 from recipe_engine import recipe_api
@@ skipping 466 matching lines @@
           raise
         if has_failing_swarming_tests:
           self.m.isolate.isolate_tests(self.m.chromium.output_dir,
                                        verbose=True)
 
     with self.wrap_chromium_tests(mastername):
       return self.m.test_utils.determine_new_failures(api, tests,
                                                       deapply_patch_fn)
 
   def analyze(self, affected_files, exes, compile_targets, config_file_name,
-              additional_names=None):
+              additional_names=None, legacy_postprocess=True):
     """Runs "analyze" step to determine targets affected by the patch.
 
     Returns a tuple of:
       - boolean, indicating whether patch requires compile
       - list of matching exes (see filter recipe module)
       - list of targets that need to be compiled (see filter recipe module)"""
 
     original_exes = exes[:]
     original_compile_targets = compile_targets[:]
 
     if additional_names is None:
       additional_names = ['chromium']
 
     use_mb = (self.m.chromium.c.project_generator.tool == 'mb')
     build_output_dir = '//out/%s' % self.m.chromium.c.build_config_fs
     self.m.filter.does_patch_require_compile(
         affected_files,
         exes=exes,
         compile_targets=compile_targets,
         additional_names=additional_names,
         config_file_name=config_file_name,
         use_mb=use_mb,
         build_output_dir=build_output_dir,
         cros_board=self.m.chromium.c.TARGET_CROS_BOARD)
 
     if not self.m.filter.result:
       # Patch does not require compile.
       return False, [], []
 
-    if 'all' in compile_targets:
+    if legacy_postprocess:
+      if 'all' in compile_targets:
+        compile_targets = self.m.filter.compile_targets
+      else:
+        compile_targets = list(set(compile_targets) &
+                               set(self.m.filter.compile_targets))
+      # Always add |matching_exes|. They will be covered by |compile_targets|,
+      # but adding |matching_exes| makes determing if conditional tests are
+      # necessary easier. For example, if we didn't do this we could end up
+      # with chrome_run as a compile_target and not chrome (since chrome_run
+      # depends upon chrome). This results in not picking up
+      # NaclIntegrationTest as it depends upon chrome not chrome_run.
+      compile_targets = list(set(self.m.filter.matching_exes + compile_targets))

[Adrian Kuegel, 2015/06/15 14:19:44]

I have the feeling that this should be done in any case. Could you please move
this line behind this if legacy_postprocess/else block?

[Paweł Hajdan Jr., 2015/06/15 15:02:44]

I believe this should be handled by the analyzer. I don't think we should do the
additional post-processing, especially that with
https://codereview.chromium.org/1176553003 we're just using matching_exes
returned by analyzer anyway.

+    else:
       compile_targets = self.m.filter.compile_targets
-    else:
-      compile_targets = list(set(compile_targets) &
-                             set(self.m.filter.compile_targets))
-    # Always add |matching_exes|. They will be covered by |compile_targets|,
-    # but adding |matching_exes| makes determing if conditional tests are
-    # necessary easier. For example, if we didn't do this we could end up
-    # with chrome_run as a compile_target and not chrome (since chrome_run
-    # depends upon chrome). This results in not picking up
-    # NaclIntegrationTest as it depends upon chrome not chrome_run.
-    compile_targets = list(set(self.m.filter.matching_exes + 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 and not use_mb):
       compile_targets.extend(['crash_service'])
 
     # Emit more detailed output useful for debugging.
     analyze_details = {
@@ skipping 72 matching lines @@
           master_config.get('build_gs_bucket'),
           extra_url_components=None)
     elif (mastername == 'tryserver.chromium.perf' or
           (mastername == 'tryserver.chromium.linux' and
            buildername == 'linux_full_bisect_builder')):
       return None
     else:
       return self.m.archive.legacy_upload_url(
           master_config.get('build_gs_bucket'),
           extra_url_components=self.m.properties['mastername'])