Adds ability to filter the set of tests that are run by a bot

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 re
 
 DEPS = [
   'bot_update',
   'chromium',
   'filter',
@@ skipping 406 matching lines @@
   """Returns true if the builder |name| should be filtered. |regexs| is a list
   of the regular expressions specifying the builders that should *not* be
   filtered. If |name| completely matches one of the regular expressions than
   false is returned, otherwise true."""
   for regex in regexs:
     match = re.match(regex, name)
     if match and match.end() == len(name):
       return False
   return True
 
+def get_test_names(gtest_tests, swarming_tests):
+  """Returns the names of each of the tests in |gtest_tests| and
+  |swarming_tests|. These are lists of GTestTest and SwarmingGTestTest."""
+  return [test.name for test in gtest_tests + swarming_tests]
+
+def filter_tests(possible_tests, needed_tests):

[iannucci, 2014/07/30 01:20:37]

nit: 2 spaces between module-level definitions

[sky, 2014/07/30 21:14:16]

I assume you mean 2 newlines.

+  """Returns a list of all the tests in |possible_tests| whose name is in
+  |needed_tests|."""
+  result = []
+  for test in possible_tests:
+    if test.name in needed_tests:
+      result.append(test)
+  return result
+
 add_swarming_builder('linux_chromium_rel', 'linux_chromium_rel_swarming',
                      'tryserver.chromium.linux')
 add_swarming_builder('linux_chromium_chromeos_rel',
                      'linux_chromium_chromeos_rel_swarming',
                      'tryserver.chromium.linux')
 add_swarming_builder('win_chromium_rel', 'win_chromium_rel_swarming',
                      'tryserver.chromium.win')
 add_swarming_builder('mac_chromium_rel', 'mac_chromium_rel_swarming',
                      'tryserver.chromium.mac')
 
@@ skipping 108 matching lines @@
         },
         {
           'test': 'browser_tests',
           'exclude_builders': ['tryserver.chromium.win:win_chromium_x64_rel'],
         },
       ]),
   )
   step_result.presentation.step_text = 'path: %s' % test_spec_path
   test_spec = step_result.json.output
 
-  # See if the patch needs to compile on the current platform.
-  if isinstance(test_spec, dict) and should_filter_builder(
-    buildername, test_spec.get('non_filter_builders', [])):
-    api.filter.does_patch_require_compile(
-      exclusions=test_spec.get('gtest_tests_filter_exclusions', []))
-    if not api.filter.result:
-      return
-
   def should_use_test(test):
     """Given a test dict from test spec returns True or False."""
     if 'platforms' in test:
       if api.platform.name not in test['platforms']:
         return False
     if 'chromium_configs' in test:
       if bot_config['chromium_config'] not in test['chromium_configs']:
         return False
     if 'exclude_builders' in test:
       if '%s:%s' % (mastername, buildername) in test['exclude_builders']:
         return False
     return True
 
   # Parse test spec file into list of Test instances.
   compile_targets, gtest_tests, swarming_tests = parse_test_spec(
       test_spec,
       bot_config.get('enable_swarming'),
       should_use_test)
 
+  # See if the patch needs to compile on the current platform.
+  if isinstance(test_spec, dict) and should_filter_builder(
+    buildername, test_spec.get('non_filter_builders', [])):
+    api.filter.does_patch_require_compile(
+      exclusions=test_spec.get('gtest_tests_filter_exclusions', []),
+      exes=get_test_names(gtest_tests, swarming_tests))
+    if not api.filter.result:
+      return
+    # Patch needs compile. Filter the list of test targets.
+    if buildername in test_spec.get('filter_tests_builders', []):
+      gtest_tests = filter_tests(gtest_tests, api.filter.matching_exes)
+      swarming_tests = filter_tests(swarming_tests, api.filter.matching_exes)
+
   # Swarming uses Isolate to transfer files to swarming bots.
   # set_isolate_environment modifies GYP_DEFINES to enable test isolation.
   if bot_config.get('use_isolate') or swarming_tests:
     api.isolate.set_isolate_environment(api.chromium.c)
 
   # If going to use swarming_client (pinned in src/DEPS), ensure it is
   # compatible with what recipes expect.
   if swarming_tests:
     api.swarming.check_client_version()
 
@@ skipping 327 matching lines @@
         api.isolate.output_json(['base_unittests']))
   )
 
   # Tests analyze module by not specifying a non_filter_builders.
   yield (
     api.test('no_compile_because_of_analyze') +
     props(buildername='linux_chromium_rel') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
       })
-    )
+    ) +
+    api.override_step_data(
+      'analyze',
+      stdout=api.json.output({'status': 'No dependency',
+                              'targets': []}))
   )
 
   # Tests analyze module by way of not specifying non_filter_builders and file
   # matching exclusion list. This should result in a compile.
   yield (
     api.test('compile_because_of_analyze_matching_exclusion') +
     props(buildername='linux_chromium_rel') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests_filter_exclusions': ['f.*'],
       })
     )
   )
 
   # Tests analyze module by way of not specifying non_filter_builders and
   # analyze result returning true. This should result in a compile.
   yield (
     api.test('compile_because_of_analyze') +
     props(buildername='linux_chromium_rel') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
       })
     ) +
     api.override_step_data(
       'analyze',
-      api.raw_io.stream_output('Found dependency'))
+      stdout=api.json.output({'status': 'Found dependency',
+                              'targets': []}))
   )
+
+  # Tests analyze module by way of not specifying non_filter_builders and
+  # analyze result returning true along with a smaller set of tests.
+  yield (
+    api.test('compile_because_of_analyze_with_filtered_tests_no_builder') +
+    props(buildername='linux_chromium_rel') +
+    api.platform.name('linux') +
+    api.override_step_data('read test spec', api.json.output({
+        'gtest_tests': [
+          {
+            'test': 'base_unittests',
+            'swarming': {'can_use_on_swarming_builders': True},
+          },
+          {
+            'test': 'browser_tests',
+          },
+          {
+            'test': 'unittests',
+          },
+        ],
+      })
+    ) +
+    api.override_step_data(
+      'analyze',
+      stdout=api.json.output({'status': 'Found dependency',
+                              'targets': ['browser_tests', 'base_unittests']}))
+  )
+
+  # Tests analyze module by way of not specifying non_filter_builders and
+  # analyze result returning true along with a smaller set of tests. This
+  # specifices a 'filter_test_builder', so that this bot uses the filtered set.
+  yield (
+    api.test('compile_because_of_analyze_with_filtered_tests') +
+    props(buildername='linux_chromium_rel') +
+    api.platform.name('linux') +
+    api.override_step_data('read test spec', api.json.output({
+        'filter_tests_builders': 'linux_chromium_rel',
+        'gtest_tests': [
+          {
+            'test': 'base_unittests',
+            'swarming': {'can_use_on_swarming_builders': True},
+          },
+          {
+            'test': 'browser_tests',
+          },
+          {
+            'test': 'unittests',
+          },
+        ],
+      })
+    ) +
+    api.override_step_data(
+      'analyze',
+      stdout=api.json.output({'status': 'Found dependency',
+                              'targets': ['browser_tests', 'base_unittests']}))
+  )