Add support for cc_perftests and other non-telemetry gtest based tests.

scripts/slave/runtest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """A tool used to run a Chrome test executable and process the output.
 
 This script is used by the buildbot slaves. It must be run from the outer
 build directory, e.g. chrome-release/build/.
 
@@ skipping 155 matching lines @@
     except OSError as e:
       print ' error killing dbus-daemon with PID %s: %s' % (dbus_pid, e)
   # Try to clean up any stray DBUS_SESSION_BUS_ADDRESS environment
   # variable too. Some of the bots seem to re-invoke runtest.py in a
   # way that this variable sticks around from run to run.
   if 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
     del os.environ['DBUS_SESSION_BUS_ADDRESS']
     print ' cleared DBUS_SESSION_BUS_ADDRESS environment variable'
 
 
-def _RunGTestCommand(command, extra_env, log_processor=None, pipes=None):
+def _RunGTestCommand(
+    options, command, extra_env, log_processor=None, pipes=None):
   """Runs a test, printing and possibly processing the output.
 
   Args:
+    options: Options passed for this invocation of runtest.py.
     command: A list of strings in a command (the command and its arguments).
     extra_env: A dictionary of extra environment variables to set.
     log_processor: A log processor instance which has the ProcessLine method.
     pipes: A list of command string lists which the output will be piped to.
 
   Returns:
     The process return code.
   """
   env = os.environ.copy()
   if extra_env:
     print 'Additional test environment:'
     for k, v in sorted(extra_env.items()):
       print '  %s=%s' % (k, v)
   env.update(extra_env or {})
 
   # Trigger bot mode (test retries, redirection of stdio, possibly faster,
   # etc.) - using an environment variable instead of command-line flags because
   # some internal waterfalls run this (_RunGTestCommand) for totally non-gtest
   # code.
   # TODO(phajdan.jr): Clean this up when internal waterfalls are fixed.
   env.update({'CHROMIUM_TEST_LAUNCHER_BOT_MODE': '1'})
 
+  log_processors = {}

[Paweł Hajdan Jr., 2015/02/11 08:24:03]

Could you extract the runtest.py change to a separate CL? Then we could limit
the scope of reverts if things go wrong, and particularly the runtest.py change
seems risky.

[shatch, 2015/02/12 20:46:32]

Done.

   if log_processor:
-    return chromium_utils.RunCommand(
-        command, pipes=pipes, parser_func=log_processor.ProcessLine, env=env)
-  else:
-    return chromium_utils.RunCommand(command, pipes=pipes, env=env)
+    log_processors[log_processor.__class__.__name__] = log_processor
+
+  if (not 'GTestLogParser' in log_processors and
+      options.log_processor_output_file):
+    log_processors['GTestLogParser'] = gtest_utils.GTestLogParser()
+
+  def _ProcessLine(line):
+    for current_log_processor in log_processors.values():
+      current_log_processor.ProcessLine(line)
+
+  result = chromium_utils.RunCommand(
+      command, pipes=pipes, parser_func=_ProcessLine, env=env)
+
+  if options.log_processor_output_file:
+    _WriteLogProcessorResultsToOutput(
+        log_processors['GTestLogParser'], options.log_processor_output_file)
+
+  return result
 
 
 def _GetMaster():
   """Return the master name for the current host."""
   return chromium_utils.GetActiveMaster()
 
 
 def _GetMasterString(master):
   """Returns a message describing what the master is."""
   return '[Running for master: "%s"]' % master
@@ skipping 499 matching lines @@
   chart_json = log_processor.ChartJson()
   if chart_json:
     return results_dashboard.MakeDashboardJsonV1(
         chart_json,
         args['revisions'], args['system'], args['mastername'],
         args['buildername'], args['buildnumber'],
         args['supplemental_columns'], log_processor.IsReferenceBuild())
   return None
 
 
+def _WriteLogProcessorResultsToOutput(log_processor, log_output_file):
+  """Writes the log processor's results to a file.
+
+  Args:
+  chartjson_file: Path to the file to write the results.
+    log_processor: An instance of a log processor class, which has been used to
+        process the test output, so it contains the test results.
+  """
+  with open(log_output_file, 'w') as f:
+    results = {
+      'passed': log_processor.PassedTests(),
+      'failed': log_processor.FailedTests(),
+      'flakes': log_processor.FlakyTests(),
+    }
+    json.dump(results, f)
+
+
 def _WriteChartJsonToOutput(chartjson_file, log_processor, args):
   """Writes the dashboard chartjson to a file for display in the waterfall.
 
   Args:
   chartjson_file: Path to the file to write the chartjson.
     log_processor: An instance of a log processor class, which has been used to
         process the test output, so it contains the test results.
     args: Dict of additional args to send to results_dashboard.
   """
   assert log_processor.IsChartJson()
@@ skipping 424 matching lines @@
           options.test_launcher_summary_output)
       command.append('--test-launcher-summary-output=%s' % json_file_name)
 
     pipes = []
     if options.enable_asan:
       symbolize_command = _GetSanitizerSymbolizeCommand()
       pipes = [symbolize_command, ['c++filt']]
 
     command = _GenerateRunIsolatedCommand(build_dir, test_exe_path, options,
                                           command)
-    result = _RunGTestCommand(command, extra_env, pipes=pipes,
+    result = _RunGTestCommand(options, command, extra_env, pipes=pipes,
                               log_processor=log_processor)
   finally:
     if http_server:
       http_server.StopServer()
     if _UsingGtestJson(options):
       _UploadGtestJsonSummary(json_file_name,
                               options.build_properties,
                               test_exe)
       log_processor.ProcessJSONFile(options.build_dir)
 
@@ skipping 86 matching lines @@
 
   # Nuke anything that appears to be stale chrome items in the temporary
   # directory from previous test runs (i.e.- from crashes or unittest leaks).
   slave_utils.RemoveChromeTemporaryFiles()
 
   dirs_to_cleanup = [tmpdir]
   crash_files_before = set([])
   crash_files_after = set([])
   crash_files_before = set(crash_utils.list_crash_logs())
 
-  result = _RunGTestCommand(command, extra_env, log_processor)
+  result = _RunGTestCommand(options, command, extra_env, log_processor)
 
   # Because test apps kill themselves, iossim sometimes returns non-zero
   # status even though all tests have passed.  Check the log_processor to
   # see if the test run was successful.
   if log_processor.CompletedWithoutFailure():
     result = 0
   else:
     result = 1
 
   if result != 0:
@@ skipping 145 matching lines @@
 
     pipes = []
     # See the comment in main() regarding offline symbolization.
     if options.use_symbolization_script:
       symbolize_command = _GetSanitizerSymbolizeCommand(
           strip_path_prefix=options.strip_path_prefix)
       pipes = [symbolize_command]
 
     command = _GenerateRunIsolatedCommand(build_dir, test_exe_path, options,
                                           command)
-    result = _RunGTestCommand(command, extra_env, pipes=pipes,
+    result = _RunGTestCommand(options, command, extra_env, pipes=pipes,
                               log_processor=log_processor)
   finally:
     if http_server:
       http_server.StopServer()
     if start_xvfb:
       xvfb.StopVirtualX(slave_name)
     if _UsingGtestJson(options):
       if options.use_symbolization_script:
         _SymbolizeSnippetsInJSON(options, json_file_name)
       if json_file_name:
@@ skipping 106 matching lines @@
                                       test_exe_path=test_exe_path,
                                       document_root=options.document_root)
 
     if _UsingGtestJson(options):
       json_file_name = log_processor.PrepareJSONFile(
           options.test_launcher_summary_output)
       command.append('--test-launcher-summary-output=%s' % json_file_name)
 
     command = _GenerateRunIsolatedCommand(build_dir, test_exe_path, options,
                                           command)
-    result = _RunGTestCommand(command, extra_env, log_processor)
+    result = _RunGTestCommand(options, command, extra_env, log_processor)
   finally:
     if http_server:
       http_server.StopServer()
     if _UsingGtestJson(options):
       _UploadGtestJsonSummary(json_file_name,
                               options.build_properties,
                               test_exe)
       log_processor.ProcessJSONFile(options.build_dir)
 
   if options.enable_pageheap:
@@ skipping 58 matching lines @@
   run_test_target_option = '--release'
   if options.target == 'Debug':
     run_test_target_option = '--debug'
   command = ['src/build/android/test_runner.py', 'gtest',
              run_test_target_option, '-s', test_suite]
 
   if options.flakiness_dashboard_server:
     command += ['--flakiness-dashboard-server=%s' %
         options.flakiness_dashboard_server]
 
-  result = _RunGTestCommand(command, extra_env, log_processor=log_processor)
+  result = _RunGTestCommand(
+      options, command, extra_env, log_processor=log_processor)
 
   if options.generate_json_file:
     if not _GenerateJSONForTestResults(options, log_processor):
       return 1
 
   if options.annotate:
     annotation_utils.annotate(
         options.test_type, result, log_processor,
         options.factory_properties.get('full_test_name'),
         perf_dashboard_id=options.perf_dashboard_id)
@@ skipping 124 matching lines @@
                            help='Start virtual X server on Linux.')
   option_parser.add_option('--no-xvfb', action='store_false', dest='xvfb',
                            help='Do not start virtual X server on Linux.')
   option_parser.add_option('--sharding-args', dest='sharding_args',
                            default='',
                            help='Options to pass to sharding_supervisor.')
   option_parser.add_option('-o', '--results-directory', default='',
                            help='output results directory for JSON file.')
   option_parser.add_option('--chartjson-file', default='',
                            help='File to dump chartjson results.')
+  option_parser.add_option('--log-processor-output-file', default='',
+                           help='File to dump gtest log processor results.')
   option_parser.add_option('--builder-name', default=None,
                            help='The name of the builder running this script.')
   option_parser.add_option('--slave-name', default=None,
                            help='The name of the slave running this script.')
   option_parser.add_option('--master-class-name', default=None,
                            help='The class name of the buildbot master running '
                                 'this script: examples include "Chromium", '
                                 '"ChromiumWebkit", and "ChromiumGPU". The '
                                 'flakiness dashboard uses this value to '
                                 'categorize results. See buildershandler.py '
@@ skipping 316 matching lines @@
   finally:
     if did_launch_dbus:
       # It looks like the command line argument --exit-with-session
       # isn't working to clean up the spawned dbus-daemon. Kill it
       # manually.
       _ShutdownDBus()
 
 
 if '__main__' == __name__:
   sys.exit(main())