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 logging
 import os
+import sys
 
 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
 from pylib.utils import report_results
 
+sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib'))
 
+from common import unittest_util
 
 def Dispatch(options):
   attached_devices = []
   if options.test_device:
     attached_devices = [options.test_device]
   else:
     attached_devices = android_commands.GetAttachedDevices()
 
   if not attached_devices:
     logging.critical('A device must be attached and online.')
@@ skipping 18 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 = unittest_util.FilterTestNames(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,
@@ skipping 13 matching lines @@
 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)