Add duration to gtest test results.

build/android/pylib/gtest/test_runner.py

 # 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.
 
 import logging
 import os
 import re
 
 from pylib import pexpect
 from pylib.base import base_test_result
@@ skipping 52 matching lines @@
     Args:
       p: An instance of pexpect spawn class.
 
     Returns:
       A TestRunResults object.
     """
     results = base_test_result.TestRunResults()
 
     # Test case statuses.
     re_run = re.compile('\[ RUN      \] ?(.*)\r\n')
-    re_fail = re.compile('\[  FAILED  \] ?(.*)\r\n')
-    re_ok = re.compile('\[       OK \] ?(.*?) .*\r\n')
+    re_fail = re.compile('\[  FAILED  \] ?(.*?)( \((.*) ms\))?\r\r\n')

[jbudorick, 2014/11/14 01:50:24]

Narrow the second capture a little. What do you expect preceding "ms"?
(Presumably, numbers or a decimal point.)

+    re_ok = re.compile('\[       OK \] ?(.*?)( \((.*) ms\))?\r\r\n')
 
     # Test run statuses.
     re_passed = re.compile('\[  PASSED  \] ?(.*)\r\n')
     re_runner_fail = re.compile('\[ RUNNER_FAILED \] ?(.*)\r\n')
     # Signal handlers are installed before starting tests
     # to output the CRASHED marker when a crash happens.
     re_crash = re.compile('\[ CRASHED      \](.*)\r\n')
 
     log = ''
     try:
       while True:
         full_test_name = None
+
         found = p.expect([re_run, re_passed, re_runner_fail],
                          timeout=self._timeout)
         if found == 1:  # re_passed
           break
         elif found == 2:  # re_runner_fail
           break
         else:  # re_run
           full_test_name = p.match.group(1).replace('\r', '')
           found = p.expect([re_ok, re_fail, re_crash], timeout=self._timeout)
           log = p.before.replace('\r', '')
           if found == 0:  # re_ok
             if full_test_name == p.match.group(1).replace('\r', ''):
+              duration_ms = int(p.match.group(3)) if p.match.group(3) else 0
               results.AddResult(base_test_result.BaseTestResult(
                   full_test_name, base_test_result.ResultType.PASS,
-                  log=log))
+                  duration=duration_ms, log=log))
           elif found == 2:  # re_crash
             results.AddResult(base_test_result.BaseTestResult(
                 full_test_name, base_test_result.ResultType.CRASH,
                 log=log))
             break
           else:  # re_fail
+            duration_ms = int(p.match.group(3)) if p.match.group(3) else 0
             results.AddResult(base_test_result.BaseTestResult(
-                full_test_name, base_test_result.ResultType.FAIL, log=log))
+                full_test_name, base_test_result.ResultType.FAIL,
+                duration=duration_ms, log=log))
     except pexpect.EOF:
       logging.error('Test terminated - EOF')
       # We're here because either the device went offline, or the test harness
       # crashed without outputting the CRASHED marker (crbug.com/175538).
       if not self.device.IsOnline():
         raise device_errors.DeviceUnreachableError(
             'Device %s went offline.' % str(self.device))
       if full_test_name:
         results.AddResult(base_test_result.BaseTestResult(
             full_test_name, base_test_result.ResultType.CRASH,
@@ skipping 51 matching lines @@
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name):
       self._perf_controller.SetDefaultPerfMode()
     self.test_package.ClearApplicationState(self.device)
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()