Ignore compile_targets returned by analyze and rely completely on matching_exes

scripts/slave/recipes/chromium_trybot.py

Index: scripts/slave/recipes/chromium_trybot.py
diff --git a/scripts/slave/recipes/chromium_trybot.py b/scripts/slave/recipes/chromium_trybot.py
index e10f86e973d7ba34529b8372362c64a4feb8d733..0fda5f818b6cfcee553dd8aa652cfe0810abea19 100644
--- a/scripts/slave/recipes/chromium_trybot.py
+++ b/scripts/slave/recipes/chromium_trybot.py
@@ -737,11 +737,11 @@ def _RunStepsInternal(api):
   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
@@ -754,18 +754,7 @@ def _RunStepsInternal(api):
     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: