[Android] Better handle gtest crashes that generate pexpect.EOF.

build/android/pylib/gtest/test_package.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 re
 import os
 
 from pylib import constants
@@ skipping 139 matching lines @@
           if found == 0:  # re_ok
             if full_test_name == p.match.group(1).replace('\r', ''):
               ok_tests += [BaseTestResult(full_test_name, p.before)]
           elif found == 2:  # re_crash
             crashed_tests += [BaseTestResult(full_test_name, p.before)]
             break
           else:  # re_fail
             failed_tests += [BaseTestResult(full_test_name, p.before)]
     except pexpect.EOF:
       logging.error('Test terminated - EOF')
-      raise errors.DeviceUnresponsiveError('Device may be offline')
+      # 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.adb.IsOnline():
+        raise errors.DeviceUnresponsiveError('Device %s went offline.' %
+                                             self.device)
+      elif full_test_name:
+        crashed_tests += [BaseTestResult(full_test_name, p.before)]
     except pexpect.TIMEOUT:
       logging.error('Test terminated after %d second timeout.',
                     self.timeout)
       if full_test_name:
         timed_out_tests += [BaseTestResult(full_test_name, p.before)]
     finally:
       p.close()
 
     ret_code = self._GetGTestReturnCode()
     if ret_code:
       logging.critical(
           'gtest exit code: %d\npexpect.before: %s\npexpect.after: %s',
           ret_code, p.before, p.after)
 
     # Create TestResults and return
     return TestResults.FromRun(ok=ok_tests, failed=failed_tests,
                                crashed=crashed_tests, timed_out=timed_out_tests)