[Android] Fix handling of intentional crashes during death tests.

build/android/pylib/gtest/gtest_test_instance.py

 # Copyright 2014 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
 import tempfile
 
 from devil.android import apk_helper
@@ skipping 72 matching lines @@
         'ShardNanoTimeout')
 _EXTRA_SHARD_SIZE_LIMIT = (
     'org.chromium.native_test.NativeTestInstrumentationTestRunner.'
         'ShardSizeLimit')
 
 # TODO(jbudorick): Remove these once we're no longer parsing stdout to generate
 # results.
 _RE_TEST_STATUS = re.compile(
     r'\[ +((?:RUN)|(?:FAILED)|(?:OK)|(?:CRASHED)) +\]'
     r' ?([^ ]+)?(?: \((\d+) ms\))?$')
-_RE_TEST_RUN_STATUS = re.compile(
-    r'\[ +(PASSED|RUNNER_FAILED|CRASHED) \] ?[^ ]+')
 # Crash detection constants.
 _RE_TEST_ERROR = re.compile(r'FAILURES!!! Tests run: \d+,'
                                     r' Failures: \d+, Errors: 1')
 _RE_TEST_CURRENTLY_RUNNING = re.compile(r'\[ERROR:.*?\]'
                                     r' Currently running: (.*)')
 
 def ParseGTestListTests(raw_list):
   """Parses a raw test list as provided by --gtest_list_tests.
 
   Args:
@@ skipping 27 matching lines @@
 
 
 def ParseGTestOutput(output):
   """Parses raw gtest output and returns a list of results.
 
   Args:
     output: A list of output lines.
   Returns:
     A list of base_test_result.BaseTestResults.
   """
+  duration = 0
+  fallback_result_type = None
   log = []
   result_type = None
   results = []
   test_name = None
 
   def handle_possibly_unknown_test():
     if test_name is not None:
       results.append(base_test_result.BaseTestResult(
-          test_name, base_test_result.ResultType.UNKNOWN, 0,
-          log=('\n'.join(log) if log else '')))
+          test_name,
+          fallback_result_type or base_test_result.ResultType.UNKNOWN,
+          duration, log=('\n'.join(log) if log else '')))
 
   for l in output:
     logging.info(l)
     matcher = _RE_TEST_STATUS.match(l)
     if matcher:
       if matcher.group(1) == 'RUN':
         handle_possibly_unknown_test()
+        duration = 0
+        fallback_result_type = None
         log = []
+        result_type = None
       elif matcher.group(1) == 'OK':
         result_type = base_test_result.ResultType.PASS
       elif matcher.group(1) == 'FAILED':
         result_type = base_test_result.ResultType.FAIL
       elif matcher.group(1) == 'CRASHED':
-        result_type = base_test_result.ResultType.CRASH
+        fallback_result_type = base_test_result.ResultType.CRASH
       # Be aware that test name and status might not appear on same line.
       test_name = matcher.group(2) if matcher.group(2) else test_name
       duration = int(matcher.group(3)) if matcher.group(3) else 0
 
     else:
       # Needs another matcher here to match crashes, like those of DCHECK.
       matcher = _RE_TEST_CURRENTLY_RUNNING.match(l)
       if matcher:
         test_name = matcher.group(1)
         result_type = base_test_result.ResultType.CRASH
         duration = 0 # Don't know.
 
     if log is not None:
       log.append(l)
 
     if result_type and test_name:
       results.append(base_test_result.BaseTestResult(
           test_name, result_type, duration,
           log=('\n'.join(log) if log else '')))
-      log = None
-      result_type = None
       test_name = None
 
   handle_possibly_unknown_test()
 
   return results
 
 
 class GtestTestInstance(test_instance.TestInstance):
 
   def __init__(self, args, isolate_delegate, error_func):
@@ skipping 211 matching lines @@
             if l and not l.startswith('#')]
 
     return '*-%s' % ':'.join(disabled_filter_items)
 
   #override
   def TearDown(self):
     """Clear the mappings created by SetUp."""
     if self._isolate_delegate:
       self._isolate_delegate.Clear()