Added an annotation to label Integration tests.

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 collections
 import logging
@@ skipping 183 matching lines @@
 
 def ProcessJavaTestOptions(options):
   """Processes options/arguments and populates |options| with defaults."""
 
   if options.annotation_str:
     options.annotations = options.annotation_str.split(',')
   elif options.test_filter:
     options.annotations = []
   else:
     options.annotations = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest',
-                           'EnormousTest']
+                           'EnormousTest', 'IntegrationTest']
 
   if options.exclude_annotation_str:
     options.exclude_annotations = options.exclude_annotation_str.split(',')
   else:
     options.exclude_annotations = []
 
 
 def AddInstrumentationTestOptions(option_parser):
   """Adds Instrumentation test options to |option_parser|."""
 
@@ skipping 15 matching lines @@
   option_parser.add_option('-w', '--wait_debugger', dest='wait_for_debugger',
                            action='store_true',
                            help='Wait for debugger.')
   option_parser.add_option(
       '--test-apk', dest='test_apk',
       help=('The name of the apk containing the tests '
             '(without the .apk extension; e.g. "ContentShellTest").'))
   option_parser.add_option('--coverage-dir',
                            help=('Directory in which to place all generated '
                                  'EMMA coverage files.'))
+  option_parser.add_option('--device-flags', dest='device_flags', default='',
+                           help='The relative filepath to a file containing '
+                                'command-line flags to set on the device')
 
 
 def ProcessInstrumentationOptions(options, error_func):
   """Processes options/arguments and populate |options| with defaults.
 
   Args:
     options: optparse.Options object.
     error_func: Function to call with the error message in case of an error.
 
   Returns:
@@ skipping 42 matching lines @@
       options.test_filter,
       options.test_data,
       options.save_perf_json,
       options.screenshot_failures,
       options.wait_for_debugger,
       options.coverage_dir,
       options.test_apk,
       options.test_apk_path,
       options.test_apk_jar_path,
       options.test_runner,
-      options.test_support_apk_path
+      options.test_support_apk_path,
+      options.device_flags
       )
 
 
 def AddUIAutomatorTestOptions(option_parser):
   """Adds UI Automator test options to |option_parser|."""
 
   option_parser.usage = '%prog uiautomator [options]'
   option_parser.commands_dict = {}
   option_parser.example = (
       '%prog uiautomator --test-jar=chrome_shell_uiautomator_tests'
@@ skipping 277 matching lines @@
       test_results, test_exit_code = test_dispatcher.RunTests(
           tests, runner_factory, devices, shard=True, test_timeout=None,
           num_retries=options.num_retries)
 
       results.AddTestRunResults(test_results)
 
       # Only allow exit code escalation
       if test_exit_code and exit_code != constants.ERROR_EXIT_CODE:
         exit_code = test_exit_code
 
+  if options.device_flags:
+    options.device_flags = '%s/%s' % (constants.DIR_SOURCE_ROOT,
+                                      options.device_flags)
+
   report_results.LogFull(
       results=results,
       test_type='Instrumentation',
       test_package=os.path.basename(options.test_apk),
       annotation=options.annotations,
       flakiness_server=options.flakiness_dashboard_server)
 
   return exit_code
 
 
@@ skipping 217 matching lines @@
 
 def main():
   signal.signal(signal.SIGUSR1, DumpThreadStacks)
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   return command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main())