(Reland) Added tombstones in instrumentation tests results.

build/android/tombstones.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 #
 # Find the most recent tombstone file(s) on all connected devices
 # and prints their stacks.
 #
 # Assumes tombstone file was created with current symbols.
@@ skipping 141 matching lines @@
 
 def _ResolveTombstones(jobs, tombstones):
   """Resolve a list of tombstones.
 
   Args:
     jobs: the number of jobs to use with multiprocess.
     tombstones: a list of tombstones.
   """
   if not tombstones:
     logging.warning('No tombstones to resolve.')
-    return
+    return []
   if len(tombstones) == 1:
     data = [_ResolveTombstone(tombstones[0])]
   else:
     pool = multiprocessing.Pool(processes=jobs)
     data = pool.map(_ResolveTombstone, tombstones)
+  resolved_tombstones = []
   for tombstone in data:
-    for line in tombstone:
-      logging.info(line)
+    resolved_tombstones.extend(tombstone)
+  return resolved_tombstones
 
-
-def _GetTombstonesForDevice(device, args):
+def _GetTombstonesForDevice(device, resolve_all_tombstones,
+                            include_stack_symbols,
+                            wipe_tombstones):
   """Returns a list of tombstones on a given device.
 
   Args:
     device: An instance of DeviceUtils.
-    args: command line arguments
+    resolve_all_tombstone: Whether to resolve every tombstone.
+    include_stack_symbols: Whether to include symbols for stack data.
+    wipe_tombstones: Whether to wipe tombstones.
   """
   ret = []
   all_tombstones = list(_ListTombstones(device))
   if not all_tombstones:
     logging.warning('No tombstones.')
     return ret
 
   # Sort the tombstones in date order, descending
   all_tombstones.sort(cmp=lambda a, b: cmp(b[1], a[1]))
 
   # Only resolve the most recent unless --all-tombstones given.
-  tombstones = all_tombstones if args.all_tombstones else [all_tombstones[0]]
+  tombstones = all_tombstones if resolve_all_tombstones else [all_tombstones[0]]
 
   device_now = _GetDeviceDateTime(device)
   try:
     for tombstone_file, tombstone_time in tombstones:
       ret += [{'serial': str(device),
                'device_abi': device.product_cpu_abi,
                'device_now': device_now,
                'time': tombstone_time,
                'file': tombstone_file,
-               'stack': args.stack,
+               'stack': include_stack_symbols,
                'data': _GetTombstoneData(device, tombstone_file)}]
   except device_errors.CommandFailedError:
     for entry in device.StatDirectory(
         '/data/tombstones', as_root=True, timeout=60):
       logging.info('%s: %s', str(device), entry)
     raise
 
   # Erase all the tombstones if desired.
-  if args.wipe_tombstones:
+  if wipe_tombstones:
     for tombstone_file, _ in all_tombstones:
       _EraseTombstone(device, tombstone_file)
 
   return ret
 
+def ClearAllTombstones(device):
+  """Clear all tombstones in the device.
+
+  Args:
+    device: An instance of DeviceUtils.
+  """
+  all_tombstones = list(_ListTombstones(device))
+  if not all_tombstones:
+    logging.warning('No tombstones to clear.')
+
+  for tombstone_file, _ in all_tombstones:
+    _EraseTombstone(device, tombstone_file)
+
+def ResolveTombstones(device, resolve_all_tombstones, include_stack_symbols,
+                      wipe_tombstones, jobs=4):
+  """Resolve tombstones in the device.
+
+  Args:
+    device: An instance of DeviceUtils.
+    resolve_all_tombstone: Whether to resolve every tombstone.
+    include_stack_symbols: Whether to include symbols for stack data.
+    wipe_tombstones: Whether to wipe tombstones.
+    jobs: Number of jobs to use when processing multiple crash stacks.
+  """
+  return _ResolveTombstones(jobs,
+                            _GetTombstonesForDevice(device,
+                                                    resolve_all_tombstones,
+                                                    include_stack_symbols,
+                                                    wipe_tombstones))
 
 def main():
   custom_handler = logging.StreamHandler(sys.stdout)
   custom_handler.setFormatter(run_tests_helper.CustomFormatter())
   logging.getLogger().addHandler(custom_handler)
   logging.getLogger().setLevel(logging.INFO)
 
   parser = argparse.ArgumentParser()
   parser.add_argument('--device',
                       help='The serial number of the device. If not specified '
@@ skipping 28 matching lines @@
   constants.CheckOutputDirectory()
 
   if args.device:
     devices = [device_utils.DeviceUtils(args.device)]
   else:
     devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
 
   # This must be done serially because strptime can hit a race condition if
   # used for the first time in a multithreaded environment.
   # http://bugs.python.org/issue7980
-  tombstones = []
   for device in devices:
-    tombstones += _GetTombstonesForDevice(device, args)
-
-  _ResolveTombstones(args.jobs, tombstones)
-
+    resolved_tombstones = ResolveTombstones(
+        device, args.all_tombstones,
+        args.stack, args.wipe_tombstones, args.jobs)
+    for line in resolved_tombstones:
+      logging.info(line)
 
 if __name__ == '__main__':
   sys.exit(main())