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 194 matching lines @@
       logging.info('%s: %s', str(device), entry)
     raise
 
   # Erase all the tombstones if desired.
   if args.wipe_tombstones:
     for tombstone_file, _ in all_tombstones:
       _EraseTombstone(device, tombstone_file)
 
   return ret
 
+def _clearAllTombstones(device):

[jbudorick, 2016/08/01 17:39:18]

nit: _ClearAllTombstones

[BigBossZhiling, 2016/08/01 22:35:13]

Done.

+  """Clear all tombstones in the device..

[jbudorick, 2016/08/01 17:39:18]

nit: only one . at the end

[BigBossZhiling, 2016/08/01 22:35:13]

Done.

+
+  Args:
+    device: An instance of DeviceUtils.
+  """
+  all_tombstones = list(_ListTombstones(device))
+  if not all_tombstones:
+    logging.warning('No tombstones.')
+
+  for tombstone_file, _ in all_tombstones:
+    _EraseTombstone(device, tombstone_file)
 
 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 '
                            'will use all devices.')
   parser.add_argument('--blacklist-file', help='Device blacklist JSON file.')
   parser.add_argument('-a', '--all-tombstones', action='store_true',
                       help='Resolve symbols for all tombstones, rather than '
                            'just the most recent.')
   parser.add_argument('-s', '--stack', action='store_true',
                       help='Also include symbols for stack data')
   parser.add_argument('-w', '--wipe-tombstones', action='store_true',
                       help='Erase all tombstones from device after processing')
   parser.add_argument('-j', '--jobs', type=int,
                       default=4,
                       help='Number of jobs to use when processing multiple '
                            'crash stacks.')
   parser.add_argument('--output-directory',
                       help='Path to the root build directory.')
   parser.add_argument('--adb-path', type=os.path.abspath,
                       help='Path to the adb binary.')
+  parser.add_argument('--erase-all-with-noprocess', action='store_true',
+                      help='Erase all tombstones without doing any process.')
   args = parser.parse_args()
 
   devil_chromium.Initialize(adb_path=args.adb_path)
 
   blacklist = (device_blacklist.Blacklist(args.blacklist_file)
                if args.blacklist_file
                else None)
 
   if args.output_directory:
     constants.SetOutputDirectory(args.output_directory)
-  # Do an up-front test that the output directory is known.
-  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)
+  if args.erase_all_with_noprocess:
+    for device in devices:
+      for tombstone_file, _ in _ListTombstones(device):
+        _EraseTombstone(device, tombstone_file)
+  else:
+    # Do an up-front test that the output directory is known.
+    constants.CheckOutputDirectory()
 
-  _ResolveTombstones(args.jobs, tombstones)
-
+    # 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)
 
 if __name__ == '__main__':
   sys.exit(main())