Fix Android run_tests.py to report failure on crashes.

build/android/run_tests.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.
 
 """Runs all the native unit tests.
 
 1. Copy over test binary to /data/local on device.
 2. Resources: chrome/unit_tests requires resources (chrome.pak and en-US.pak)
    to be deployed to the device (in /data/local/tmp).
@@ skipping 148 matching lines @@
   def Stop(self):
     """Stop Xvfb if needed.  Linux only."""
     if self._pid:
       try:
         os.kill(self._pid, signal.SIGKILL)
       except:
         pass
       del os.environ['DISPLAY']
       self._pid = 0
 
+def PrintAnnotationForTestResults(test_results):
+  if test_results.timed_out:
+    print '@@@STEP_WARNINGS@@@'
+  elif test_results.failed:
+    print '@@@STEP_FAILURE@@@'
+  elif test_results.crashed:
+    print '@@@STEP_FAILURE@@@'
+  elif test_results.overall_fail:
+    print '@@@STEP_FAILURE@@@'
+  else:
+    print 'Step success!'  # No annotation needed
 
 def RunTests(device, test_suite, gtest_filter, test_arguments, rebaseline,
              timeout, performance_test, cleanup_test_files, tool,
              log_dump_name, apk, annotate=False):
   """Runs the tests.
 
   Args:
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
     gtest_filter: A gtest_filter flag.
@@ skipping 42 matching lines @@
     if rebaseline:
       test.UpdateFilter(test.test_results.failed)
     test.test_results.LogFull()
   # Zip all debug info outputs into a file named by log_dump_name.
   debug_info.GTestDebugInfo.ZipAndCleanResults(
       os.path.join(run_tests_helper.CHROME_DIR, 'out', 'Release',
           'debug_info_dumps'),
       log_dump_name, [d for d in debug_info_list if d])
 
   if annotate:
-    if test.test_results.timed_out:
-      print '@@@STEP_WARNINGS@@@'
-    elif test.test_results.failed:
-      print '@@@STEP_FAILURE@@@'
-    elif test.test_results.overall_fail:
-      print '@@@STEP_FAILURE@@@'
-    else:
-      print 'Step success!'  # No annotation needed
+    PrintAnnotationForTestResults(test.test_results)
 
   return TestResults.FromTestResults(results)
 
 
 class TestSharder(BaseTestSharder):
   """Responsible for sharding the tests on the connected devices."""
 
   def __init__(self, attached_devices, test_suite, gtest_filter,
                test_arguments, timeout, rebaseline, performance_test,
-               cleanup_test_files, tool):
+               cleanup_test_files, tool, annotate):
     BaseTestSharder.__init__(self, attached_devices)
     self.test_suite = test_suite
     self.test_suite_basename = os.path.basename(test_suite)
     self.gtest_filter = gtest_filter
     self.test_arguments = test_arguments
     self.timeout = timeout
     self.rebaseline = rebaseline
     self.performance_test = performance_test
     self.cleanup_test_files = cleanup_test_files
     self.tool = tool
+    self.annotate = annotate
     test = SingleTestRunner(self.attached_devices[0], test_suite, gtest_filter,
                             test_arguments, timeout, rebaseline,
                             performance_test, cleanup_test_files, tool, 0)
     all_tests = test.test_package.GetAllTests()
     if not rebaseline:
       disabled_list = test.GetDisabledTests()
       # Only includes tests that do not have any match in the disabled list.
       all_tests = filter(lambda t:
                          not any([fnmatch.fnmatch(t, disabled_pattern)
                                   for disabled_pattern in disabled_list]),
@@ skipping 14 matching lines @@
     shard_test_list = self.tests[index * shard_size : (index + 1) * shard_size]
     test_filter = ':'.join(shard_test_list)
     return SingleTestRunner(device, self.test_suite,
                             test_filter, self.test_arguments, self.timeout,
                             self.rebaseline, self.performance_test,
                             self.cleanup_test_files, self.tool, index)
 
   def OnTestsCompleted(self, test_runners, test_results):
     """Notifies that we completed the tests."""
     test_results.LogFull()
+    if self.annotate:
+      PrintAnnotationForTestResults(test_results)
     if test_results.failed and self.rebaseline:
       test_runners[0].UpdateFilter(test_results.failed)
 
 
 
 def _RunATestSuite(options):
   """Run a single test suite.
 
   Helper for Dispatch() to allow stop/restart of the emulator across
   test bundles.  If using the emulator, we start it on entry and stop
@@ skipping 25 matching lines @@
   if not attached_devices:
     logging.critical('A device must be attached and online.')
     return 1
 
   if (len(attached_devices) > 1 and options.test_suite and
       not options.gtest_filter and not options.performance_test):
     sharder = TestSharder(attached_devices, options.test_suite,
                           options.gtest_filter, options.test_arguments,
                           options.timeout, options.rebaseline,
                           options.performance_test,
-                          options.cleanup_test_files, options.tool)
+                          options.cleanup_test_files, options.tool,
+                          options.annotate)
     test_results = sharder.RunShardedTests()
   else:
     test_results = RunTests(attached_devices[0], options.test_suite,
                             options.gtest_filter, options.test_arguments,
                             options.rebaseline, options.timeout,
                             options.performance_test,
                             options.cleanup_test_files, options.tool,
                             options.log_dump,
                             options.apk,
                             annotate=options.annotate)
@@ skipping 117 matching lines @@
   # from all suites, but the buildbot associates the exit status only with the
   # most recent step).
   if options.annotate:
     return 0
   else:
     return failed_tests_count
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))