[Android] Add --no-timeout to perf sharder.

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.
-
-TODO(gkanwar):
-* Add options to run Monkey tests.
-"""
+"""Runs all types of tests from one unified interface."""
 
 import collections
 import logging
 import optparse
 import os
 import shutil
 import sys
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 404 matching lines @@
       options.extra_args)
 
 
 def AddPerfTestOptions(option_parser):
   """Adds perf test options to |option_parser|."""
 
   option_parser.usage = '%prog perf [options]'
   option_parser.command_list = []
   option_parser.example = ('%prog perf --steps perf_steps.json')
 
-  option_parser.add_option('--steps', help='JSON file containing the list '
-      'of perf steps to run.')
-  option_parser.add_option('--flaky-steps',
-                           help='A JSON file containing steps that are flaky '
-                                'and will have its exit code ignored.')
-  option_parser.add_option('--print-step', help='The name of a previously '
-      'executed perf step to print.')
-
+  option_parser.add_option(
+      '--steps',
+      help='JSON file containing the list of perf steps to run.')
+  option_parser.add_option(
+      '--flaky-steps',
+      help=('A JSON file containing steps that are flaky '
+            'and will have its exit code ignored.'))
+  option_parser.add_option(
+      '--print-step',
+      help='The name of a previously executed perf step to print.')
+  option_parser.add_option(
+      '--no-timeout', action='store_true',
+      help=('Do not impose a timeout. Each perf step is responsible for '
+            'implementing the timeout logic.'))
   AddCommonOptions(option_parser)
 
 
 def ProcessPerfTestOptions(options, error_func):
   """Processes all perf test options.
 
   Args:
     options: optparse.Options object.
     error_func: Function to call with the error message in case of an error.
 
   Returns:
     A PerfOptions named tuple which contains all options relevant to
     perf tests.
   """
   if not options.steps and not options.print_step:
     error_func('Please specify --steps or --print-step')
   return perf_test_options.PerfOptions(
-      options.steps, options.flaky_steps, options.print_step)
+      options.steps, options.flaky_steps, options.print_step,
+      options.no_timeout)
 
 
 def _RunGTests(options, error_func, devices):
   """Subcommand of RunTestsCommands which runs gtests."""
   ProcessGTestOptions(options)
 
   exit_code = 0
   for suite_name in options.suite_name:
     # TODO(gkanwar): Move this into ProcessGTestOptions once we require -s for
     # the gtest command.
@@ skipping 92 matching lines @@
   return exit_code
 
 
 def _RunMonkeyTests(options, error_func, devices):
   """Subcommand of RunTestsCommands which runs monkey tests."""
   monkey_options = ProcessMonkeyTestOptions(options, error_func)
 
   runner_factory, tests = monkey_setup.Setup(monkey_options)
 
   results, exit_code = test_dispatcher.RunTests(
-      tests, runner_factory, devices, shard=False, test_timeout=None)
+      tests, runner_factory, devices, shard=False, test_timeout=None,
+      num_retries=options.num_retries)
 
   report_results.LogFull(
       results=results,
       test_type='Monkey',
       test_package='Monkey')
 
   return exit_code
 
 
 def _RunPerfTests(options, error_func, devices):
   """Subcommand of RunTestsCommands which runs perf tests."""
   perf_options = ProcessPerfTestOptions(options, error_func)
     # Just print the results from a single previously executed step.
   if perf_options.print_step:
     return perf_test_runner.PrintTestOutput(perf_options.print_step)
 
   runner_factory, tests = perf_setup.Setup(perf_options)
 
   results, _ = test_dispatcher.RunTests(
-      tests, runner_factory, devices, shard=True, test_timeout=None)
+      tests, runner_factory, devices, shard=True, test_timeout=None,
+      num_retries=options.num_retries)
 
   report_results.LogFull(
       results=results,
       test_type='Perf',
       test_package='Perf')
   # Always return 0 on the sharding stage. Individual tests exit_code
   # will be returned on the print_step stage.
   return 0
 
 
@@ skipping 122 matching lines @@
 
 
 def main(argv):
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   return command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))