Add annotator tags for better debugging. More suppressions and other tweaks.

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 122 matching lines @@
       try:
         os.kill(self._pid, signal.SIGKILL)
       except:
         pass
       del os.environ['DISPLAY']
       self._pid = 0
 
 
 def RunTests(device, test_suite, gtest_filter, test_arguments, rebaseline,
              timeout, performance_test, cleanup_test_files, tool,
-             log_dump_name, fast_and_loose=False):
+             log_dump_name, fast_and_loose=False, 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.
     test_arguments: Additional arguments to pass to the test binary.
     rebaseline: Whether or not to run tests in isolation and update the filter.
     timeout: Timeout for each test.
     performance_test: Whether or not performance test(s).
     cleanup_test_files: Whether or not to cleanup test files on device.
     tool: Name of the Valgrind tool.
     log_dump_name: Name of log dump file.
     fast_and_loose: should we go extra-fast but sacrifice stability
       and/or correctness?  Intended for quick cycle testing; not for bots!
+    annotate: should we print buildbot-style annotations?
 
   Returns:
     A TestResults object.
   """
   results = []
 
   if test_suite:
     global _TEST_SUITES
     if not os.path.exists(test_suite):
       logging.critical('Unrecognized test suite %s, supported: %s' %
                        (test_suite, _TEST_SUITES))
       if test_suite in _TEST_SUITES:
         logging.critical('(Remember to include the path: out/Release/%s)',
                          test_suite)
       return TestResults.FromOkAndFailed([], [BaseTestResult(test_suite, '')])
     fully_qualified_test_suites = [test_suite]
   else:
     fully_qualified_test_suites = FullyQualifiedTestSuites()
   debug_info_list = []
   print 'Known suites: ' + str(_TEST_SUITES)
   print 'Running these: ' + str(fully_qualified_test_suites)
   for t in fully_qualified_test_suites:
+    if annotate:
+      print '@@@BUILD_STEP Test suite %s@@@' % os.path.basename(t)
     test = SingleTestRunner(device, t, gtest_filter, test_arguments,
                             timeout, rebaseline, performance_test,
                             cleanup_test_files, tool, not not log_dump_name,
                             fast_and_loose=fast_and_loose)
     test.RunTests()
+
     results += [test.test_results]
     # Collect debug info.
     debug_info_list += [test.dump_debug_info]
     if rebaseline:
       test.UpdateFilter(test.test_results.failed)
     elif test.test_results.failed:
-      # Stop running test if encountering failed test.
       test.test_results.LogFull()
-      break
   # 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@@@'
+    else:
+      print 'Step success!'  # No annotation needed
+
   return TestResults.FromTestResults(results)
 
+
 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
   it on exit.
 
   Args:
     options: options for running the tests.
+    first_run: is this the first time we tried this test?

[nyquist, 2012/01/13 02:16:59]

Where is this argument?

[John Grabowski, 2012/01/13 02:20:11]

Dangling comment; removed

 
   Returns:
     0 if successful, number of failing tests otherwise.
   """
   attached_devices = []
+  buildbot_emulator = None
+
   if options.use_emulator:
     t = TimeProfile('Emulator launch')
     buildbot_emulator = emulator.Emulator(options.fast_and_loose)
     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,
                           options.rebaseline, options.timeout,
                           options.performance_test,
                           options.cleanup_test_files, options.tool,
                           options.log_dump,
-                          fast_and_loose=options.fast_and_loose)
+                          fast_and_loose=options.fast_and_loose,
+                          annotate=options.annotate)
 
   if buildbot_emulator:
     buildbot_emulator.Shutdown()
 
   # Another chance if we timed out?  At this point It is safe(r) to
   # run fast and loose since we just uploaded all the test data and
   # binary.
   if test_results.timed_out and options.repeat:
     logging.critical('Timed out; repeating in fast_and_loose mode.')
     options.fast_and_loose = True
@@ skipping 11 matching lines @@
 
   Args:
     options: options for running the tests.
 
   Returns:
     0 if successful, number of failing tests otherwise.
   """
   if options.test_suite == 'help':
     ListTestSuites()
     return 0
-  buildbot_emulator = None
 
   if options.use_xvfb:
     xvfb = Xvfb()
     xvfb.Start()
 
-  all_test_suites = [options.test_suite] or FullyQualifiedTestSuites()
+  if options.test_suite:
+    all_test_suites = [options.test_suite]
+  else:
+    all_test_suites = FullyQualifiedTestSuites()
   failures = 0
-  if options.use_emulator and options.restart_emulator_each_test:
-    for suite in all_test_suites:
-      options.test_suite = suite
-      failures += _RunATestSuite(options)
-  else:
+  for suite in all_test_suites:
+    options.test_suite = suite
     failures += _RunATestSuite(options)
 
   if options.use_xvfb:
     xvfb.Stop()
   return failures
 
 
 def ListTestSuites():
   """Display a list of available test suites
   """
@@ skipping 35 matching lines @@
                            action='store_true', default=False,
                            help='Go faster (but be less stable), '
                            'for quick testing.  Example: when tracking down '
                            'tests that hang to add to the disabled list, '
                            'there is no need to redeploy the test binary '
                            'or data to the device again.  '
                            'Don\'t use on bots by default!')
   option_parser.add_option('--repeat', dest='repeat', type='int',
                            default=2,
                            help='Repeat count on test timeout')
   option_parser.add_option('--restart_emulator_each_test',

[nyquist, 2012/01/13 02:16:59]

Is this option still needed?

[John Grabowski, 2012/01/13 02:20:11]

Sadly, yes.

                            default='True',
                            help='Restart the emulator for each test?')
+  option_parser.add_option('--annotate', default=True,
+                           help='Print buildbot-style annotate messages '
+                           'for each test suite.  Default=True')
   options, args = option_parser.parse_args(argv)
   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))