Android bot changes for robustness, profiling, and debugging.

build/android/run_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 47 matching lines @@
 import cmd_helper
 import debug_info
 import emulator
 import run_tests_helper
 from single_test_runner import SingleTestRunner
 from test_package_executable import TestPackageExecutable
 from test_result import BaseTestResult, TestResults
 
 _TEST_SUITES = ['base_unittests', 'sql_unittests', 'ipc_tests', 'net_unittests']
 
+
+class TimeProfile(object):
+  """Class for simple profiling of action, with logging of cost."""
+
+  def __init__(self, description):
+    self._description = description
+    self.Start()
+
+  def Start(self):
+    self._starttime = time.time()
+
+  def Stop(self):
+    """Stop profiling and dump a log."""
+    if self._starttime:
+      stoptime = time.time()
+      logging.info('%fsec to perform %s' %
+                   (stoptime - self._starttime, self._description))
+      self._starttime = None
+
 class Xvfb(object):
   """Class to start and stop Xvfb if relevant.  Nop if not Linux."""
 
   def __init__(self):
     self._pid = 0
 
   def _IsLinux(self):
     """Return True if on Linux; else False."""
     return sys.platform.startswith('linux')
 
@@ skipping 109 matching lines @@
     ListTestSuites()
     return 0
   buildbot_emulator = None
   attached_devices = []
 
   if options.use_xvfb:
     xvfb = Xvfb()
     xvfb.Start()
 
   if options.use_emulator:
+    t = TimeProfile('Emulator launch')
     buildbot_emulator = emulator.Emulator()
+    buildbot_emulator.Reset()
     buildbot_emulator.Launch()
+    t.Stop()
     attached_devices.append(buildbot_emulator.device)
   else:
     attached_devices = android_commands.GetAttachedDevices()
 
   if not attached_devices:
     logging.critical('A device must be attached and online.')
     return 1
 
   test_results = RunTests(attached_devices[0], options.test_suite,
                           options.gtest_filter, options.test_arguments,
@@ skipping 49 matching lines @@
   if len(args) > 1:
     print 'Unknown argument:', args[1:]
     option_parser.print_usage()
     sys.exit(1)
   run_tests_helper.SetLogLevel(options.verbose_count)
   return Dispatch(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))