Ignore compile_targets returned by analyze and rely completely on matching_exes

scripts/slave/recipes/chromium_trybot.py

 # Copyright 2013 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 collections
 
 from recipe_engine.types import freeze
 
 DEPS = [
   'amp',
@@ skipping 719 matching lines @@
           bot_config['mastername'],
           bot_config['buildername'],
           master_dict,
           test_spec,
           override_bot_type='builder_tester',
           override_tests=tests)
 
   targets_for_analyze = sorted(set(
       all_compile_targets(api, tests + tests_including_triggered) +
       compile_targets))
-  requires_compile, matching_exes, compile_targets = \
+  requires_compile, matching_exes, _ = \
       api.chromium_tests.analyze(

[Dirk Pranke, 2015/10/20 20:10:06]

why not change the signature of analyze() to not take or return compile_targets
instead?

[sky, 2015/10/21 16:16:13]

Especially since the return values of the two are now the same.

           affected_files,
           targets_for_analyze,
-          compile_targets,
+          targets_for_analyze,
           'trybot_analyze_config.json')
   if bot_config.get('analyze_mode') == 'compile':
     # Do not pass tests to compile_specific_targets below. It assumes
     # all of these targets would be compiled (matching_exes), but that's
     # explicitly what we're not doing here. One example of how this may
     # break is only foo_unittests being in returned compile_targets,
     # while matching_exes containing both foo_unittests and foo_unittests_run.
     # Then if we proceed with tests passed to compile_specific_targets,
     # trying to isolate affected targets may fail.
     tests = []
     tests_including_triggered = []
 
-    # TODO(sergiyb): This is a hotfix that should be removed if we implement a
-    # proper long-term fix. It is currently needed to ensure that we compile
-    # matching_exes also when a bot is running analyze in compile-only mode and
-    # stay consistent with corresponding waterfall bots. Please see
-    # http://crbug.com/529798 for more context.
-    compile_targets = sorted(set(compile_targets + matching_exes))
-  else:
-    # Note that compile_targets doesn't necessarily include matching_exes,
-    # and for correctness we need to add them. Otherwise it's possible we'd
-    # only build say foo_unittests but not foo_unittests_run and fail when
-    # trying to isolate the tests. Also see above comment.
-    compile_targets = sorted(set(compile_targets + matching_exes))
+  compile_targets = sorted(set(matching_exes))
 
   # Blink tests have to bypass "analyze", see below.
   if requires_compile or add_blink_tests:
     tests = tests_in_compile_targets(api, matching_exes, tests)
     tests_including_triggered = tests_in_compile_targets(
         api, matching_exes, tests_including_triggered)
 
     # Blink tests are tricky at this moment. We'd like to use "analyze" for
     # everything else. However, there are blink changes that only add or modify
     # layout test files (html etc). This is not recognized by "analyze" as
@@ skipping 820 matching lines @@
                            api.test_utils.canned_test_output(passing=True))
   )
 
   yield (
     api.test('use_v8_patch_on_blink_trybot') +
     props(mastername='tryserver.blink',
           buildername='mac_blink_rel',
           patch_project='v8') +
     api.platform.name('mac')
   )