Add support for Junit tests in platform mode.

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 382 matching lines @@
   group = parser.add_argument_group('JUnit Test Options')
   group.add_argument(
       '-s', '--test-suite', dest='test_suite', required=True,
       help=('JUnit test suite to run.'))
   group.add_argument(
       '-f', '--test-filter', dest='test_filter',
       help='Filters tests googletest-style.')
   group.add_argument(
       '--package-filter', dest='package_filter',
       help='Filters tests by package.')
+  # TODO(mikecase): Add --repeat and --break-on-failure to common options.
+  # These options are required for platform-mode support.
+  group.add_argument(
+      '--repeat', dest='repeat', type=int, default=0,
+      help='Number of times to repeat the specified set of tests.')
+  group.add_argument(
+      '--break-on-failure', '--break_on_failure',
+      dest='break_on_failure', action='store_true',
+      help='Whether to break on failure.')
   group.add_argument(
       '--runner-filter', dest='runner_filter',
       help='Filters tests by runner class. Must be fully qualified.')
   group.add_argument(
-      '--sdk-version', dest='sdk_version', type=int,
-      help='The Android SDK version.')
-  group.add_argument(
       '--coverage-dir', dest='coverage_dir', type=os.path.realpath,
       help='Directory to store coverage info.')
   AddCommonOptions(parser)
 
 
 def AddMonkeyTestOptions(parser):
   """Adds monkey test options to |parser|."""
 
   group = parser.add_argument_group('Monkey Test Options')
   group.add_argument(
@@ skipping 294 matching lines @@
   elif command == 'python':
     return _RunPythonTests(args)
   else:
     raise Exception('Unknown test type.')
 
 
 _SUPPORTED_IN_PLATFORM_MODE = [
   # TODO(jbudorick): Add support for more test types.
   'gtest',
   'instrumentation',
+  'junit',
   'perf',
 ]
 
 
 def RunTestsInPlatformMode(args):
 
   def infra_error(message):
     logging.fatal(message)
     sys.exit(constants.INFRA_EXIT_CODE)
 
@@ skipping 138 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())