Updates the test runner script exit codes

build/android/buildbot/bb_device_steps.py

Index: build/android/buildbot/bb_device_steps.py
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 74943b49f4459da08c0b9e92589dda4bcd3820e9..440c1508c7843530f83d44018d152db12619c324 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -11,10 +11,10 @@ import shutil
 import sys
 
 import bb_utils
+import bb_annotations
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import android_commands
-from pylib import buildbot_report
 from pylib import constants
 from pylib.gtest import gtest_config
 
@@ -94,7 +94,7 @@ def RebootDevices():
         print '%s failed to startup.' % device
 
     if any(results):
-      buildbot_report.PrintWarning()
+      bb_annotations.PrintWarning()
     else:
       print 'Reboots complete.'
 
@@ -112,7 +112,7 @@ def RunTestSuites(options, suites):
   if options.asan:
     args.append('--tool=asan')
   for suite in suites:
-    buildbot_report.PrintNamedStep(suite.name)
+    bb_annotations.PrintNamedStep(suite.name)
     cmd = ['build/android/test_runner.py', 'gtest', '-s', suite.name] + args
     if suite.is_suite_exe:
       cmd.append('--exe')
@@ -129,12 +129,12 @@ def RunBrowserTestSuite(options):
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
-  buildbot_report.PrintNamedStep(constants.BROWSERTEST_SUITE_NAME)
+  bb_annotations.PrintNamedStep(constants.BROWSERTEST_SUITE_NAME)
   RunCmd(['build/android/test_runner.py', 'content_browsertests'] + args)
 
 def RunChromeDriverTests(_):
   """Run all the steps for running chromedriver tests."""
-  buildbot_report.PrintNamedStep('chromedriver_annotation')
+  bb_annotations.PrintNamedStep('chromedriver_annotation')
   RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
           '--android-package=%s' % constants.CHROMIUM_TEST_SHELL_PACKAGE])
 
@@ -147,7 +147,7 @@ def InstallApk(options, test, print_step=False):
     print_step: Print a buildbot step
   """
   if print_step:
-    buildbot_report.PrintNamedStep('install_%s' % test.name.lower())
+    bb_annotations.PrintNamedStep('install_%s' % test.name.lower())
   args = ['--apk', test.apk, '--apk_package', test.apk_package]
   if options.target == 'Release':
     args.append('--release')
@@ -162,7 +162,7 @@ def RunInstrumentationSuite(options, test):
     options: options object
     test: An I_TEST namedtuple
   """
-  buildbot_report.PrintNamedStep('%s_instrumentation_tests' % test.name.lower())
+  bb_annotations.PrintNamedStep('%s_instrumentation_tests' % test.name.lower())
 
   InstallApk(options, test)
   args = ['--test-apk', test.test_apk, '--test_data', test.test_data,
@@ -188,7 +188,7 @@ def RunInstrumentationSuite(options, test):
 
 def RunWebkitLint(target):
   """Lint WebKit's TestExpectation files."""
-  buildbot_report.PrintNamedStep('webkit_lint')
+  bb_annotations.PrintNamedStep('webkit_lint')
   RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py',
           '--lint-test-files',
           '--chromium',
@@ -197,7 +197,7 @@ def RunWebkitLint(target):
 
 def RunWebkitLayoutTests(options):
   """Run layout tests on an actual device."""
-  buildbot_report.PrintNamedStep('webkit_tests')
+  bb_annotations.PrintNamedStep('webkit_tests')
   cmd_args = [
         '--no-show-results',
         '--no-new-test-results',
@@ -248,14 +248,14 @@ def ProvisionDevices(options):
   RunCmd(['adb', 'start-server'])
   RunCmd(['sleep', '1'])
 
-  buildbot_report.PrintNamedStep('provision_devices')
+  bb_annotations.PrintNamedStep('provision_devices')
   if options.reboot:
     RebootDevices()
   RunCmd(['build/android/provision_devices.py', '-t', options.target])
 
 
 def DeviceStatusCheck(_):
-  buildbot_report.PrintNamedStep('device_status_check')
+  bb_annotations.PrintNamedStep('device_status_check')
   RunCmd(['build/android/device_status_check.py'], halt_on_failure=True)
 
 
@@ -292,7 +292,7 @@ def GetTestStepCmds():
 
 def LogcatDump(options):
   # Print logcat, kill logcat monitor
-  buildbot_report.PrintNamedStep('logcat_dump')
+  bb_annotations.PrintNamedStep('logcat_dump')
   logcat_file = os.path.join(CHROME_SRC, 'out', options.target, 'full_log')
   with open(logcat_file, 'w') as f:
     RunCmd([
@@ -302,7 +302,7 @@ def LogcatDump(options):
 
 
 def GenerateTestReport(options):
-  buildbot_report.PrintNamedStep('test_report')
+  bb_annotations.PrintNamedStep('test_report')
   for report in glob.glob(
       os.path.join(CHROME_SRC, 'out', options.target, 'test_logs', '*.log')):
     RunCmd(['cat', report])