Updates the test runner script exit codes

build/android/buildbot/bb_utils.py

 # 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.
 
 import json
 import optparse
 import os
 import pipes
 import subprocess
 import sys
 
+import bb_annotations
+
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-from pylib import buildbot_report
+from pylib import constants
 
 
 TESTING = 'BUILDBOT_TESTING' in os.environ
 
 BB_BUILD_DIR = os.path.abspath(
     os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir,
     os.pardir, os.pardir, os.pardir, os.pardir))
 
 CHROME_SRC = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..'))
@@ skipping 12 matching lines @@
   if TESTING:
     class MockPopen(object):
       @staticmethod
       def wait():
         return 0
     return MockPopen()
   return subprocess.Popen(command, cwd=CHROME_SRC, stdout=stdout)
 
 
 def RunCmd(command, flunk_on_failure=True, halt_on_failure=False,
-           warning_code=88, stdout=None):
+           warning_code=constants.WARNING_EXIT_CODE, stdout=None):
   """Run a command relative to the chrome source root."""
   code = SpawnCmd(command, stdout).wait()
   print '<', CommandToString(command)
   if code != 0:
     print 'ERROR: process exited with code %d' % code
     if code != warning_code and flunk_on_failure:
-      buildbot_report.PrintError()
+      bb_annotations.PrintError()
     else:
-      buildbot_report.PrintWarning()
+      bb_annotations.PrintWarning()
     # Allow steps to have both halting (i.e. 1) and non-halting exit codes.
     if code != warning_code and halt_on_failure:
       print 'FATAL %d != %d' % (code, warning_code)
       sys.exit(1)
   return code
 
 
 def GetParser():
   def ConvertJson(option, _, value, parser):
     setattr(parser.values, option.dest, json.loads(value))
@@ skipping 14 matching lines @@
 
 def RunSteps(steps, step_cmds, options):
   unknown_steps = set(steps) - set(step for step, _ in step_cmds)
   if unknown_steps:
     print >> sys.stderr, 'FATAL: Unknown steps %s' % list(unknown_steps)
     sys.exit(1)
 
   for step, cmd in step_cmds:
     if step in steps:
       cmd(options)