Add multiple device/os filtering and a config file.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 109 matching lines @@
 
 def AddRemoteDeviceOptions(parser):
   group = parser.add_argument_group('Remote Device Options')
 
   group.add_argument('--trigger', default='',
                      help=('Only triggers the test if set. Stores test_run_id '
                            'in given file path. '))
   group.add_argument('--collect', default='',
                      help=('Only collects the test results if set. '
                            'Gets test_run_id from given file path.'))
-  group.add_argument('--remote-device', default='',
+  group.add_argument('--remote-device', action='append',
                      help='Device type to run test on.')
-  group.add_argument('--remote-device-os', default='',
-                     help='OS to have on the device.')
   group.add_argument('--results-path', default='',
                      help='File path to download results to.')
   group.add_argument('--api-protocol',
                      help='HTTP protocol to use. (http or https)')
   group.add_argument('--api-address', help='Address to send HTTP requests.')
   group.add_argument('--api-port', help='Port to send HTTP requests to.')
   group.add_argument('--runner-type', default='',
                      help='Type of test to run as.')
   group.add_argument('--runner-package', help='Package name of test.')
   group.add_argument('--device-type', default='Android',
                      choices=constants.VALID_DEVICE_TYPES,
                      help=('Type of device to run on. iOS or android'))
+  group.add_argument('--remote-device-file', help=('File with JSON to select'
+                     ' remote device. Overrides all other flags.'))
+
+  device_os_group = group.add_mutually_exclusive_group()
+  device_os_group.add_argument('--remote-device-minimum-os',
+                               help='Minimum OS on device.')
+  device_os_group.add_argument('--remote-device-os', action='append',
+                               help='OS to have on the device.')
 
   api_secret_group = group.add_mutually_exclusive_group()
   api_secret_group.add_argument('--api-secret', default='',
                                 help='API secret for remote devices.')
   api_secret_group.add_argument('--api-secret-file', default='',
                                 help='Path to file that contains API secret.')
 
   api_key_group = group.add_mutually_exclusive_group()
   api_key_group.add_argument('--api-key', default='',
                              help='API key for remote devices.')
@@ skipping 833 matching lines @@
     subparser = command_parsers.add_parser(
         test_type, usage='%(prog)s [options]', help=config.help_txt)
     config.add_options_func(subparser)
 
   args = parser.parse_args()
   return RunTestsCommand(args, parser)
 
 
 if __name__ == '__main__':
   sys.exit(main())