Android: support glob-style gtest filters with content browser tests

build/android/pylib/browsertests/dispatch.py

 # Copyright (c) 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 fnmatch
 import logging
 import os
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
 from pylib import ports
 from pylib.base import shard
 from pylib.gtest import dispatch as gtest_dispatch
 from pylib.gtest import test_runner
@@ skipping 31 matching lines @@
         options.test_arguments,
         options.timeout,
         options.cleanup_test_files,
         options.tool,
         options.build_type,
         options.webkit,
         constants.BROWSERTEST_TEST_PACKAGE_NAME,
         constants.BROWSERTEST_TEST_ACTIVITY_NAME,
         constants.BROWSERTEST_COMMAND_LINE_FILE)
 
-    # Get tests and split them up based on the number of devices.
+  # Get tests and split them up based on the number of devices.
+  all_enabled = gtest_dispatch.GetAllEnabledTests(RunnerFactory,
+                                                  attached_devices)
   if options.gtest_filter:
-    all_tests = [t for t in options.gtest_filter.split(':') if t]
+    all_tests = _ApplyGtestFilter(all_enabled, options.gtest_filter)
   else:
-    all_enabled = gtest_dispatch.GetAllEnabledTests(RunnerFactory,
-                                                    attached_devices)
     all_tests = _FilterTests(all_enabled)
 
   # Run tests.
   # TODO(nileshagrawal): remove this abnormally long setup timeout once fewer
   # files are pushed to the devices for content_browsertests: crbug.com/138275
   setup_timeout = 20 * 60  # 20 minutes
   test_results = shard.ShardAndRunTests(RunnerFactory, attached_devices,
                                         all_tests, options.build_type,
                                         setup_timeout=setup_timeout,
                                         test_timeout=None,
                                         num_retries=options.num_retries)
   report_results.LogFull(
       results=test_results,
       test_type='Unit test',
       test_package=constants.BROWSERTEST_SUITE_NAME,
       build_type=options.build_type,
       flakiness_server=options.flakiness_dashboard_server)
   report_results.PrintAnnotation(test_results)
 
 def _FilterTests(all_enabled_tests):
   """Filters out tests and fixtures starting with PRE_ and MANUAL_."""
   return [t for t in all_enabled_tests if _ShouldRunOnBot(t)]
 
+def _ApplyGtestFilter(all_enabled_tests, gtest_filter):

[frankf, 2013/05/16 01:15:52]

Take a look at //chrome/test/pylib/common/unittest_util.py#FilterTests

Since this is generic, we can just resuse that.

[Sami, 2013/05/16 10:41:34]

Thanks for the tip -- code reuse ftw!

+  """Computes the list of tests that match a gtest filter.
+
+  Args:
+    all_enabled_tests: List of available and enabled tests.
+    gtest_filter: Gtest filter string. See testing/gtest/src/gtest.cc.
+
+  Returns:
+    A list of tests that match the given gtest filter.
+  """
+  filter_patterns = [t for t in gtest_filter.split(':') if t]
+  # Any test that matches a positive patterns but does not match any negative
+  # pattern should be returned.
+  result = set()
+  for pattern in filter_patterns:
+    if not pattern.startswith('-'):
+      result.update([t for t in all_enabled_tests
+                     if fnmatch.fnmatch(t, pattern)])
+  for pattern in filter_patterns:
+    if pattern.startswith('-'):
+      result.difference_update([t for t in all_tests

[frankf, 2013/05/16 01:15:52]

all_tests -> all_enabeld_tests

[Sami, 2013/05/16 10:41:34]

Oops, well spotted.

+                                if fnmatch.fnmatch(t, pattern[1:])])
+  return list(result)
+
 def _ShouldRunOnBot(test):
   fixture, case = test.split('.', 1)
   if _StartsWith(fixture, case, "PRE_"):
     return False
   if _StartsWith(fixture, case, "MANUAL_"):
     return False
   return True
 
 def _StartsWith(a, b, prefix):
   return a.startswith(prefix) or b.startswith(prefix)