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

build/android/pylib/browsertests/dispatch.py

Index: build/android/pylib/browsertests/dispatch.py
diff --git a/build/android/pylib/browsertests/dispatch.py b/build/android/pylib/browsertests/dispatch.py
index c598d6447bd88ef7fe621c4fb22f2b1a21e6404d..5dd9a7ccd0d97cd0a6539740548229fde236acff 100644
--- a/build/android/pylib/browsertests/dispatch.py
+++ b/build/android/pylib/browsertests/dispatch.py
@@ -4,6 +4,7 @@
 
 import logging
 import os
+import sys
 
 from pylib import android_commands
 from pylib import cmd_helper
@@ -14,7 +15,9 @@ 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.CHROME_DIR, 'chrome', 'test', 'pylib'))
 
+from common import unittest_util

[Paweł Hajdan Jr., 2013/05/16 18:26:28]

This suggest things should be moved down to build pylib instead of chrome
dependency being added here.

 
 def Dispatch(options):
   attached_devices = []
@@ -53,12 +56,12 @@ def Dispatch(options):
         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.FilterTests(all_enabled, options.gtest_filter)

[frankf, 2013/05/16 17:15:18]

So we don't want to filter out PRE_ and MANUAL_ in this case since gtest_filter
option is only supplied for running tests locally?

[Paweł Hajdan Jr., 2013/05/16 18:26:28]

Oh, why are you trying to duplicate test_launcher.cc functionality? :-/

Additionally, you'd also be duplicating run_test_cases.py functionality. Kindly
do not reinvent the wheel. :)

   else:
-    all_enabled = gtest_dispatch.GetAllEnabledTests(RunnerFactory,
-                                                    attached_devices)
     all_tests = _FilterTests(all_enabled)
 
   # Run tests.