Add iOS device test runner

ios/build/bots/scripts/run.py

 #!/usr/bin/python
 # Copyright 2016 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.
 
 """Run a test.
 
 Sample usage:
   ./run.py \
   -a src/xcodebuild/Release-iphoneos/base_unittests.app \
@@ skipping 15 matching lines @@
 
 
 def main(args, test_args):
   summary = {}
   tr = None
 
   if not os.path.exists(args.out_dir):
     os.makedirs(args.out_dir)
 
   try:
-    tr = test_runner.SimulatorTestRunner(
-      args.app,
-      args.iossim,
-      args.platform,
-      args.version,
-      args.xcode_version,
-      args.out_dir,
-      test_args=test_args,
-    )
+    if args.iossim and args.platform and args.version:
+      tr = test_runner.SimulatorTestRunner(
+        args.app,
+        args.iossim,
+        args.platform,
+        args.version,
+        args.xcode_version,
+        args.out_dir,
+        env_vars=args.env_var,
+        test_args=test_args,
+      )
+    else:
+      tr = test_runner.DeviceTestRunner(
+        args.app,
+        args.xcode_version,
+        args.out_dir,
+        env_vars=args.env_var,
+        test_args=test_args,
+      )
 
     return 0 if tr.launch() else 1
   except test_runner.TestRunnerError as e:
     sys.stderr.write(traceback.format_exc())
     summary['step_text'] = '%s%s' % (
       e.__class__.__name__, ': %s' % e.args[0] if e.args else '')
 
     # test_runner.Launch returns 0 on success, 1 on failure, so return 2
     # on exception to distinguish between a test failure, and a failure
     # to launch the test at all.
@@ skipping 10 matching lines @@
   parser = argparse.ArgumentParser()
 
   parser.add_argument(
     '-a',
     '--app',
     help='Compiled .app to run.',
     metavar='app',
     required=True,
   )
   parser.add_argument(
+    '-e',
+    '--env-var',
+    action='append',
+    help='Environment variable to pass to the test itself.',
+    metavar='ENV=val',
+  )
+  parser.add_argument(
     '-i',
     '--iossim',
     help='Compiled iossim to run the app on.',
     metavar='iossim',
-    required=True,
   )
   parser.add_argument(
     '-o',
     '--out-dir',
     help='Directory to store all test data in.',
     metavar='dir',
     required=True,
   )
   parser.add_argument(
     '-p',
     '--platform',
     help='Platform to simulate.',
     metavar='sim',
-    required=True,
   )
   parser.add_argument(
     '-v',
     '--version',
     help='Version of iOS the simulator should run.',
     metavar='ver',
-    required=True,
   )
   parser.add_argument(
     '-x',
     '--xcode-version',
     help='Version of Xcode to use.',
     metavar='ver',
     required=True,
   )
 
-  sys.exit(main(*parser.parse_known_args()))
+  args, test_args = parser.parse_known_args()
+  if args.iossim or args.platform or args.version:
+    # If any of --iossim, --platform, or --version
+    # are specified then they must all be specified.
+    if not (args.iossim and args.platform and args.version):
+      parser.error(
+        'must specify all or none of -i/--iossim, -p/--platform, -v/--version')
+
+  sys.exit(main(args, test_args))