Expose the return code for gpu tests in bb_run_bot.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 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 collections
 import glob
 import hashlib
 import json
 import os
@@ skipping 480 matching lines @@
   for test in INSTRUMENTATION_TESTS.itervalues():
     RunInstrumentationSuite(options, test)
 
 
 def RunWebkitTests(options):
   RunTestSuites(options, ['webkit_unit_tests', 'blink_heap_unittests'])
   RunWebkitLint()
 
 
 def RunGPUTests(options):
+  exit_code = 0
   revision = _GetRevision(options)
   builder_name = options.build_properties.get('buildername', 'noname')
 
   bb_annotations.PrintNamedStep('pixel_tests')
-  RunCmd(['content/test/gpu/run_gpu_test.py',
-          'pixel', '-v',
-          '--browser',
-          'android-content-shell',
-          '--build-revision',
-          str(revision),
-          '--upload-refimg-to-cloud-storage',
-          '--refimg-cloud-storage-bucket',
-          'chromium-gpu-archive/reference-images',
-          '--os-type',
-          'android',
-          '--test-machine-name',
-          EscapeBuilderName(builder_name),
-          '--android-blacklist-file',
-          'out/bad_devices.json'])
+  exit_code = RunCmd(['content/test/gpu/run_gpu_test.py',
+                      'pixel', '-v',
+                      '--browser',
+                      'android-content-shell',
+                      '--build-revision',
+                      str(revision),
+                      '--upload-refimg-to-cloud-storage',
+                      '--refimg-cloud-storage-bucket',
+                      'chromium-gpu-archive/reference-images',
+                      '--os-type',
+                      'android',
+                      '--test-machine-name',
+                      EscapeBuilderName(builder_name),
+                      '--android-blacklist-file',
+                      'out/bad_devices.json']) or exit_code
 
   bb_annotations.PrintNamedStep('webgl_conformance_tests')
-  RunCmd(['content/test/gpu/run_gpu_test.py', '-v',
-          '--browser=android-content-shell', 'webgl_conformance',
-          '--webgl-conformance-version=1.0.1',
-          '--android-blacklist-file',
-          'out/bad_devices.json'])
+  exit_code = RunCmd(['content/test/gpu/run_gpu_test.py', '-v',
+                      '--browser=android-content-shell', 'webgl_conformance',
+                      '--webgl-conformance-version=1.0.1',
+                      '--android-blacklist-file',
+                      'out/bad_devices.json']) or exit_code
 
   bb_annotations.PrintNamedStep('android_webview_webgl_conformance_tests')
-  RunCmd(['content/test/gpu/run_gpu_test.py', '-v',
-          '--browser=android-webview-shell', 'webgl_conformance',
-          '--webgl-conformance-version=1.0.1',
-          '--android-blacklist-file',
-          'out/bad_devices.json'])
+  exit_code = RunCmd(['content/test/gpu/run_gpu_test.py', '-v',
+                      '--browser=android-webview-shell', 'webgl_conformance',
+                      '--webgl-conformance-version=1.0.1',
+                      '--android-blacklist-file',
+                      'out/bad_devices.json']) or exit_code
 
   bb_annotations.PrintNamedStep('gpu_rasterization_tests')
-  RunCmd(['content/test/gpu/run_gpu_test.py',
-          'gpu_rasterization', '-v',
-          '--browser',
-          'android-content-shell',
-          '--build-revision',
-          str(revision),
-          '--test-machine-name',
-          EscapeBuilderName(builder_name),
-          '--android-blacklist-file',
-          'out/bad_devices.json'])
+  exit_code = RunCmd(['content/test/gpu/run_gpu_test.py',
+                      'gpu_rasterization', '-v',
+                      '--browser',
+                      'android-content-shell',
+                      '--build-revision',
+                      str(revision),
+                      '--test-machine-name',
+                      EscapeBuilderName(builder_name),
+                      '--android-blacklist-file',
+                      'out/bad_devices.json']) or exit_code
+
+  return exit_code
 
 
 def RunPythonUnitTests(_options):
   for suite in constants.PYTHON_UNIT_TEST_SUITES:
     bb_annotations.PrintNamedStep(suite)
     RunCmd(['build/android/test_runner.py', 'python', '-s', suite])
 
 
 def GetTestStepCmds():
   return [
@@ skipping 90 matching lines @@
 
 def GenerateTestReport(options):
   bb_annotations.PrintNamedStep('test_report')
   for report in glob.glob(
       os.path.join(CHROME_OUT_DIR, options.target, 'test_logs', '*.log')):
     RunCmd(['cat', report])
     os.remove(report)
 
 
 def MainTestWrapper(options):
+  exit_code = 0
   try:
     # Spawn logcat monitor
     SpawnLogcatMonitor()
 
     # Run all device setup steps
     for _, cmd in GetDeviceSetupStepCmds():
       cmd(options)
 
     if options.install:
       for i in options.install:
         install_obj = INSTALLABLE_PACKAGES[i]
         InstallApk(options, install_obj, print_step=True)
 
     if options.test_filter:
-      bb_utils.RunSteps(options.test_filter, GetTestStepCmds(), options)
+      exit_code = bb_utils.RunSteps(
+          options.test_filter, GetTestStepCmds(), options) or exit_code
 
     if options.coverage_bucket:
       coverage_html = GenerateJavaCoverageReport(options)
       UploadHTML(options, '%s/java' % options.coverage_bucket, coverage_html,
                  'Coverage Report')
       shutil.rmtree(coverage_html, ignore_errors=True)
 
     if options.experimental:
-      RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
+      exit_code = RunTestSuites(
+          options, gtest_config.EXPERIMENTAL_TEST_SUITES) or exit_code
+
+    return exit_code
 
   finally:
     # Run all post test steps
     LogcatDump(options)
     if not options.disable_stack_tool:
       RunStackToolSteps(options)
     GenerateTestReport(options)
     # KillHostHeartbeat() has logic to check if heartbeat process is running,
     # and kills only if it finds the process is running on the host.
     provision_devices.KillHostHeartbeat()
@@ skipping 71 matching lines @@
   if options.chrome_output_dir:
     global CHROME_OUT_DIR
     global LOGCAT_DIR
     CHROME_OUT_DIR = options.chrome_output_dir
     LOGCAT_DIR = os.path.join(CHROME_OUT_DIR, 'logcat')
 
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
-  MainTestWrapper(options)
+  return MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))