Extend logcat monitor to all device actions

build/android/buildbot/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 178 matching lines @@
     set -e
   done
 }
 
 # 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
 }
 
+function bb_spawn_logcat_monitor_and_status {
+  python build/android/device_status_check.py
+  local LOGCAT_DUMP_DIR="$CHROME_SRC/out/logcat"
+  rm -rf "$LOGCAT_DUMP_DIR"
+  python build/android/adb_logcat_monitor.py "$LOGCAT_DUMP_DIR" &
+}
+
+function bb_print_logcat {
+  echo "@@@BUILD_STEP Logcat dump@@@"
+  python build/android/adb_logcat_printer.py "$LOGCAT_DUMP_DIR"
+}
+
 # Run tests on an actual device.  (Better have one plugged in!)
 function bb_run_unit_tests {
-  python build/android/device_status_check.py
-  local LOGCAT_DUMP_DIR="$CHROME_SRC/out/logcat"
-  rm -rf "$LOGCAT_DUMP_DIR"
-  python build/android/adb_logcat_monitor.py "$LOGCAT_DUMP_DIR" &
-
   build/android/run_tests.py --xvfb --verbose
-
-  echo "@@@BUILD_STEP Logcat dump@@@"
-  python build/android/adb_logcat_printer.py "$LOGCAT_DUMP_DIR"
 }
 
 # Run instrumentation test.
 # Args:
 #   $1: TEST_APK.
 #   $2: EXTRA_FLAGS to be passed to run_instrumentation_tests.py.
 function bb_run_instrumentation_test {
   local TEST_APK=${1}
   local EXTRA_FLAGS=${2}
   local INSTRUMENTATION_FLAGS="-vvv"
@@ skipping 82 matching lines @@
   )
 }
 
 # Retrieve a packed json property using python
 function bb_get_json_prop {
   local JSON="$1"
   local PROP="$2"
 
   python -c "import json; print json.loads('$JSON').get('$PROP')"
 }