[Android] Add --gtest-filter-file option to the test runner.

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 803e79f8ccb5b5d2954fc2c43285fc110ef55eaa..0d1ea614a769bca7ec456067fc32e0889d677399 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -196,9 +196,6 @@ def AddGTestOptions(parser):
                      help=('Executable name of the test suite to run. '
                            'Available suites include (but are not limited to): '
                             '%s' % ', '.join('"%s"' % s for s in gtest_suites)))
-  group.add_argument('-f', '--gtest_filter', '--gtest-filter',
-                     dest='test_filter',
-                     help='googletest-style filter string.')
   group.add_argument('--gtest_also_run_disabled_tests',
                      '--gtest-also-run-disabled-tests',
                      dest='run_disabled', action='store_true',
@@ -214,6 +211,16 @@ def AddGTestOptions(parser):
                      dest='isolate_file_path',
                      help='.isolate file path to override the default '
                           'path')
+
+  filter_group = group.add_mutually_exclusive_group()
+  filter_group.add_argument('-f', '--gtest_filter', '--gtest-filter',
+                            dest='test_filter',
+                            help='googletest-style filter string.')
+  filter_group.add_argument('--gtest-filter-file', dest='test_filter_file',
+                            help='Path to file that contains gtest-style '

[klundberg, 2015/02/02 20:05:55]

nit: above the help text use "googletest-style", here you use "gtest-style".
Consistency would be nice :-)

[jbudorick, 2015/02/02 21:36:23]

switched this one to "googletest-style"

+                                  'filter strings. (Lines will be joined with '
+                                  '":" to create a single filter string.)')
+
   AddDeviceOptions(parser)
   AddCommonOptions(parser)
   AddRemoteDeviceOptions(parser)