Roll Chrome into Mojo.

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 110 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='Nexus 5',
+  group.add_argument('--remote-device', default='',
                    help=('Device type to run test on.'))
-  group.add_argument('--remote-device-os', default='4.4.2',
+  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', default='',
@@ skipping 96 matching lines @@
       help='Saves the JSON file for each UI Perf test.')
   argument_group.add_argument(
       '--official-build', action='store_true', help='Run official build tests.')
   argument_group.add_argument(
       '--test_data', '--test-data', action='append', default=[],
       help=('Each instance defines a directory of test data that should be '
             'copied to the target(s) before running the tests. The argument '
             'should be of the form <target>:<source>, <target> is relative to '
             'the device data directory, and <source> is relative to the '
             'chromium build directory.'))
+  argument_group.add_argument(
+      '--disable-dalvik-asserts', dest='set_asserts', action='store_false',
+      default=True, help='Removes the dalvik.vm.enableassertions property')
+
 
 
 def ProcessJavaTestOptions(args):
   """Processes options/arguments and populates |options| with defaults."""
 
   # TODO(jbudorick): Handle most of this function in argparse.
   if args.annotation_str:
     args.annotations = args.annotation_str.split(',')
   elif args.test_filter:
     args.annotations = []
@@ skipping 89 matching lines @@
       args.save_perf_json,
       args.screenshot_failures,
       args.wait_for_debugger,
       args.coverage_dir,
       args.test_apk,
       args.test_apk_path,
       args.test_apk_jar_path,
       args.test_runner,
       args.test_support_apk_path,
       args.device_flags,
-      args.isolate_file_path
+      args.isolate_file_path,
+      args.set_asserts
       )
 
 
 def AddUIAutomatorTestOptions(parser):
   """Adds UI Automator test options to |parser|."""
 
   group = parser.add_argument_group('UIAutomator Test Options')
   AddJavaTestOptions(group)
   group.add_argument(
       '--package', required=True, choices=constants.PACKAGE_INFO.keys(),
@@ skipping 37 matching lines @@
       args.tool,
       args.cleanup_test_files,
       args.annotations,
       args.exclude_annotations,
       args.test_filter,
       args.test_data,
       args.save_perf_json,
       args.screenshot_failures,
       args.uiautomator_jar,
       args.uiautomator_info_jar,
-      args.package)
+      args.package,
+      args.set_asserts)
 
 
 def AddJUnitTestOptions(parser):
   """Adds junit test options to |parser|."""
 
   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(
@@ skipping 332 matching lines @@
 
 def _RunPerfTests(args):
   """Subcommand of RunTestsCommands which runs perf tests."""
   perf_options = ProcessPerfTestOptions(args)
 
   # Just save a simple json with a list of test names.
   if perf_options.output_json_list:
     return perf_test_runner.OutputJsonList(
         perf_options.steps, perf_options.output_json_list)
 
-  if perf_options.output_chartjson_data:
-    return perf_test_runner.OutputChartjson(
-        perf_options.print_step, perf_options.output_chartjson_data)
-
   # Just print the results from a single previously executed step.
   if perf_options.print_step:
-    return perf_test_runner.PrintTestOutput(perf_options.print_step)
+    return perf_test_runner.PrintTestOutput(
+        perf_options.print_step, perf_options.output_chartjson_data)
 
   runner_factory, tests, devices = perf_setup.Setup(perf_options)
 
   # shard=False means that each device will get the full list of tests
   # and then each one will decide their own affinity.
   # shard=True means each device will pop the next test available from a queue,
   # which increases throughput but have no affinity.
   results, _ = test_dispatcher.RunTests(
       tests, runner_factory, devices, shard=False, test_timeout=None,
       num_retries=args.num_retries)
@@ skipping 191 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())