Make device_status_check run only be testers

build/android/buildbot_functions.sh

 #!/bin/bash
 # Copyright (c) 2012 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.
 #
 # Bash functions used by buildbot annotator scripts for the android
 # build of chromium.  Executing this script should not perform actions
 # other than setting variables and defining of functions.
 
 # Number of jobs on the compile line; e.g.  make -j"${JOBS}"
@@ skipping 109 matching lines @@
     echo "@@@BUILD_STEP Clobber@@@"
     rm -rf "${SRC_ROOT}"/out
     if [ -e "${SRC_ROOT}"/out ] ; then
       echo "Clobber appeared to fail?  ${SRC_ROOT}/out still exists."
       echo "@@@STEP_WARNINGS@@@"
     fi
   fi
 
   # Should be called only after envsetup is done.
   bb_run_gclient_hooks
-
-  python build/android/device_status_check.py
 }
 
 
 # Setup goma.  Used internally to buildbot_functions.sh.
 function bb_setup_goma_internal {
 
   # Quick bail if I messed things up and can't wait for the CQ to
   # flush out.
   # TODO(jrg): remove this condition when things are
   # proven stable (4/1/12 or so).
@@ skipping 102 matching lines @@
 }
 
 # Run tests on an emulator.
 function bb_run_tests_emulator {
   echo "@@@BUILD_STEP Run Tests on an Emulator@@@"
   build/android/run_tests.py -e --xvfb --verbose
 }
 
 # Run tests on an actual device.  (Better have one plugged in!)
 function bb_run_tests {
+  python build/android/device_status_check.py
   echo "@@@BUILD_STEP Run Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose
 }
 
 # Run simple content shell test on device.
 function bb_run_content_shell_test {
   echo "@@@BUILD_STEP Run simple content shell test on actual hardware@@@"
   content/shell/android/simple_content_shell_test.sh \
     "${SRC_ROOT}"/out/Release/content_shell/ContentShell-debug.apk
 }
@@ skipping 29 matching lines @@
     --factory-properties "$FACTORY_PROPERTIES" \
     --build-properties "$BUILD_PROPERTIES"
   extract_exitcode=$?
   if (( $extract_exitcode > 1 )); then
     echo "@@@STEP_WARNINGS@@@"
     return
   fi
   return $extract_exitcode
   )
 }