Support xctests on simulators

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 25 matching lines @@
     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,
+        xctest=args.xctest,
       )
     else:
       tr = test_runner.DeviceTestRunner(
         args.app,
         args.xcode_version,
         args.out_dir,
         env_vars=args.env_var,
         test_args=test_args,
       )
 
@@ skipping 64 matching lines @@
     help='Version of iOS the simulator should run.',
     metavar='ver',
   )
   parser.add_argument(
     '-x',
     '--xcode-version',
     help='Version of Xcode to use.',
     metavar='ver',
     required=True,
   )
+  parser.add_argument(
+    '--xctest',
+    action='store_true',
+    help='Whether or not the given app should be run as an XCTest.',
+  )
 
   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')
 
   args_json = json.loads(args.args_json)
   args.env_var = args.env_var or []
   args.env_var.extend(args_json.get('env_var', []))
+  args.xctest = args_json.get('xctest', args.xctest)
   test_args.extend(args_json.get('test_args', []))
 
   sys.exit(main(args, test_args))