Chromium Code Reviews| Index: build/android/pylib/gtest/test_runner.py |
| diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py |
| index 75892ee6e9c32bbb235a9dc0b1ab671aa43b2abd..7a133b4ba6a1f2b9f97f3ca7cf41080f26c0f13e 100644 |
| --- a/build/android/pylib/gtest/test_runner.py |
| +++ b/build/android/pylib/gtest/test_runner.py |
| @@ -70,8 +70,8 @@ class TestRunner(base_test_runner.BaseTestRunner): |
| # 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 ex
|
| + re_ok = re.compile('\[ OK \] ?(.*?)( \((.*) ms\))?\r\r\n') |
| # Test run statuses. |
| re_passed = re.compile('\[ PASSED \] ?(.*)\r\n') |
| @@ -84,6 +84,7 @@ class TestRunner(base_test_runner.BaseTestRunner): |
| 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 |
| @@ -96,17 +97,20 @@ class TestRunner(base_test_runner.BaseTestRunner): |
| 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 |