Manual partial update from from https://crrev.com/337502

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
 import logging
 import os
 import shutil
 import signal
 import sys
 import threading
 import unittest
 
 from pylib import constants
 from pylib import forwarder
 from pylib import ports
 from pylib.base import base_test_result
 from pylib.base import environment_factory
 from pylib.base import test_dispatcher
 from pylib.base import test_instance_factory
 from pylib.base import test_run_factory
 from pylib.device import device_errors
 from pylib.device import device_utils
 from pylib.gtest import gtest_config
+# TODO(jbudorick): Remove this once we stop selectively enabling platform mode.
+from pylib.gtest import gtest_test_instance
 from pylib.gtest import setup as gtest_setup
 from pylib.gtest import test_options as gtest_test_options
 from pylib.linker import setup as linker_setup
 from pylib.host_driven import setup as host_driven_setup
 from pylib.instrumentation import setup as instrumentation_setup
 from pylib.instrumentation import test_options as instrumentation_test_options
 from pylib.junit import setup as junit_setup
 from pylib.junit import test_dispatcher as junit_dispatcher
 from pylib.monkey import setup as monkey_setup
 from pylib.monkey import test_options as monkey_test_options
@@ skipping 168 matching lines @@
                      default='',
                      help='Additional arguments to pass to the test.')
   group.add_argument('-t', dest='timeout', type=int, default=60,
                      help='Timeout to wait for each test '
                           '(default: %(default)s).')
   group.add_argument('--isolate_file_path',
                      '--isolate-file-path',
                      dest='isolate_file_path',
                      help='.isolate file path to override the default '
                           'path')
+  group.add_argument('--app-data-file', action='append', dest='app_data_files',
+                     help='A file path relative to the app data directory '
+                          'that should be saved to the host.')
+  group.add_argument('--app-data-file-dir',
+                     help='Host directory to which app data files will be'
+                          ' saved. Used with --app-data-file.')
+  group.add_argument('--delete-stale-data', dest='delete_stale_data',
+                     action='store_true',
+                     help='Delete stale test data on the device.')
 
   filter_group = group.add_mutually_exclusive_group()
   filter_group.add_argument('-f', '--gtest_filter', '--gtest-filter',
                             dest='test_filter',
                             help='googletest-style filter string.')
   filter_group.add_argument('--gtest-filter-file', dest='test_filter_file',
                             help='Path to file that contains googletest-style '
                                   'filter strings. (Lines will be joined with '
                                   '":" to create a single filter string.)')
 
@@ skipping 100 matching lines @@
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
   group.add_argument('--device-flags-file', default='',
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
   group.add_argument('--isolate_file_path',
                      '--isolate-file-path',
                      dest='isolate_file_path',
                      help='.isolate file path to override the default '
                           'path')
+  group.add_argument('--delete-stale-data', dest='delete_stale_data',
+                     action='store_true',
+                     help='Delete stale test data on the device.')
 
   AddCommonOptions(parser)
   AddDeviceOptions(parser)
   AddRemoteDeviceOptions(parser)
 
 
 def ProcessInstrumentationOptions(args):
   """Processes options/arguments and populate |options| with defaults.
 
   Args:
@@ skipping 33 matching lines @@
       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.set_asserts
+      args.set_asserts,
+      args.delete_stale_data
       )
 
 
 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 182 matching lines @@
   group.add_argument(
       '--no-timeout', action='store_true',
       help=('Do not impose a timeout. Each perf step is responsible for '
             'implementing the timeout logic.'))
   group.add_argument(
       '-f', '--test-filter',
       help=('Test filter (will match against the names listed in --steps).'))
   group.add_argument(
       '--dry-run', action='store_true',
       help='Just print the steps without executing.')
+  # Uses 0.1 degrees C because that's what Android does.
+  group.add_argument(
+      '--max-battery-temp', type=int,
+      help='Only start tests when the battery is at or below the given '
+           'temperature (0.1 C)')
   group.add_argument('single_step_command', nargs='*', action=SingleStepAction,
                      help='If --single-step is specified, the command to run.')
   AddCommonOptions(parser)
   AddDeviceOptions(parser)
 
 
 def ProcessPerfTestOptions(args):
   """Processes all perf test options.
 
   Args:
     args: argparse.Namespace object.
 
   Returns:
     A PerfOptions named tuple which contains all options relevant to
     perf tests.
   """
   # TODO(jbudorick): Move single_step handling down into the perf tests.
   if args.single_step:
     args.single_step = ' '.join(args.single_step_command)
   # TODO(jbudorick): Get rid of PerfOptions.
   return perf_test_options.PerfOptions(
       args.steps, args.flaky_steps, args.output_json_list,
       args.print_step, args.no_timeout, args.test_filter,
       args.dry_run, args.single_step, args.collect_chartjson_data,
-      args.output_chartjson_data)
+      args.output_chartjson_data, args.max_battery_temp)
 
 
 def AddPythonTestOptions(parser):
   group = parser.add_argument_group('Python Test Options')
   group.add_argument(
       '-s', '--suite', dest='suite_name', metavar='SUITE_NAME',
       choices=constants.PYTHON_UNIT_TEST_SUITES.keys(),
       help='Name of the test suite to run.')
   AddCommonOptions(parser)
 
 
 def _RunGTests(args, devices):
   """Subcommand of RunTestsCommands which runs gtests."""
   exit_code = 0
   for suite_name in args.suite_name:
     # TODO(jbudorick): Either deprecate multi-suite or move its handling down
     # into the gtest code.
     gtest_options = gtest_test_options.GTestOptions(
         args.tool,
         args.test_filter,
         args.run_disabled,
         args.test_arguments,
         args.timeout,
         args.isolate_file_path,
-        suite_name)
+        suite_name,
+        args.app_data_files,
+        args.app_data_file_dir,
+        args.delete_stale_data)
     runner_factory, tests = gtest_setup.Setup(gtest_options, devices)
 
     results, test_exit_code = test_dispatcher.RunTests(
         tests, runner_factory, devices, shard=True, test_timeout=None,
         num_retries=args.num_retries)
 
     if test_exit_code and exit_code != constants.ERROR_EXIT_CODE:
       exit_code = test_exit_code
 
     report_results.LogFull(
@@ skipping 250 matching lines @@
   if command in constants.LOCAL_MACHINE_TESTS:
     devices = []
   else:
     devices = _GetAttachedDevices(args.test_device)
 
   forwarder.Forwarder.RemoveHostLog()
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
 
   if command == 'gtest':
+    if args.suite_name[0] in gtest_test_instance.BROWSER_TEST_SUITES:
+      return RunTestsInPlatformMode(args, parser)
     return _RunGTests(args, devices)
   elif command == 'linker':
     return _RunLinkerTests(args, devices)
   elif command == 'instrumentation':
     return _RunInstrumentationTests(args, devices)
   elif command == 'uiautomator':
     return _RunUIAutomatorTests(args, devices)
   elif command == 'junit':
     return _RunJUnitTests(args)
   elif command == 'monkey':
@@ skipping 103 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())