Android buildbot: Add missing @@@ echo to 'bb_run_unit_tests'

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 75 matching lines @@
     # crbug.com/145860
     rm -rf ~/.android
     rm -rf "$build_path"
     if [[ -e $build_path ]] ; then
       echo "Clobber appeared to fail?  $build_path still exists."
       echo "@@@STEP_WARNINGS@@@"
     fi
   fi
 }
 
+# Used internally to buildbot_functions.sh.
+function _bb_android_run_tests () {
+  local FLAGS
+  FLAGS="--xvfb --verbose"
+  if [[ ${BUILDTYPE} = Release ]]; then
+    FLAGS="${FLAGS} --release"
+  fi
+  build/android/run_tests.py ${FLAGS} "$@"
+}
+
 function bb_compile_setup {
   bb_setup_goma_internal
   # Should be called only after envsetup is done.
   gclient runhooks
 }
 
 # Setup goma.  Used internally to buildbot_functions.sh.
 function bb_setup_goma_internal {
   export GOMA_API_KEY_FILE=${GOMA_DIR}/goma.key
   export GOMA_COMPILER_PROXY_DAEMON_MODE=true
@@ skipping 90 matching lines @@
     if [ $? -ne 0 ] ; then
       echo "@@@STEP_WARNINGS@@@"
     fi
     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
+  _bb_android_run_tests -e
 }
 
 function bb_spawn_logcat_monitor_and_status {
   python build/android/device_status_check.py
   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 {
-  echo "@@@BUILD_STEP Run unit tests on device@@@"
-  build/android/run_tests.py --xvfb --verbose
+  echo "@@@BUILD_STEP Run unit tests@@@"
+  _bb_android_run_tests
 }
 
 # Run WebKit's test suites: webkit_unit_tests and TestWebKitAPI
 function bb_run_webkit_unit_tests {
-  if [[ $BUILDTYPE = Release ]]; then
-    local BUILDFLAG="--release"
-  fi
-  bb_run_step build/android/run_tests.py --xvfb --verbose $BUILDFLAG \
-      -s webkit_unit_tests
-  bb_run_step build/android/run_tests.py --xvfb --verbose $BUILDFLAG \
-      -s TestWebKitAPI
+  echo "@@@BUILD_STEP Run webkit unit tests@@@"
+  _bb_android_run_tests -s webkit_unit_tests
+  _bb_android_run_tests -s TestWebKitAPI
 }
 
 # Lint WebKit's TestExpectation files.
 function bb_lint_webkit_expectation_files {
   echo "@@@BUILD_STEP webkit_lint@@@"
   bb_run_step python webkit/tools/layout_tests/run_webkit_tests.py \
     --lint-test-files \
     --chromium
 }
 
@@ skipping 19 matching lines @@
       --builder-name "$BUILDERNAME" \
       --build-number "$BUILDNUMBER" \
       --master-name "$MASTERNAME" \
       --build-name "$BUILDERNAME" \
       --platform=chromium-android \
       --test-results-server "$RESULTSERVER"
 }
 
 # Run experimental unittest bundles.
 function bb_run_experimental_unit_tests {
-  build/android/run_tests.py --xvfb --verbose -s android_webview_unittests
+  echo "@@@BUILD_STEP run experimental unit tests@@@"
+  _bb_android_run_tests -s android_webview_unittests
 }
 
 # Run findbugs.
 function bb_run_findbugs {
   echo "@@@BUILD_STEP findbugs@@@"
   if [[ $BUILDTYPE = Release ]]; then
     local BUILDFLAG="--release-build"
   fi
   bb_run_step build/android/findbugs_diff.py $BUILDFLAG
   bb_run_step tools/android/findbugs_plugin/test/run_findbugs_plugin_tests.py \
@@ skipping 31 matching lines @@
 # Args:
 #   $1: APK to be installed.
 #   $2: APK_PACKAGE for the APK to be installed.
 #   $3: TEST_APK to run the tests against.
 #   $4: TEST_DATA in format destination:source
 function bb_run_all_instrumentation_tests_for_apk {
   local APK=${1}
   local APK_PACKAGE=${2}
   local TEST_APK=${3}
   local TEST_DATA=${4}
+  local FLAGS
 
   # Install application APK.
   bb_install_apk ${APK} ${APK_PACKAGE}
 
   # Run instrumentation tests. Using -I to install the test apk.
   echo "@@@BUILD_STEP Run instrumentation tests ${TEST_APK}@@@"
+  FLAGS="-vvv"
+  if [[ "${BUILDTYPE}" == Release ]]; then
+    FLAGS="${FLAGS} --release"
+  fi
   bb_run_step python build/android/run_instrumentation_tests.py \
-      -vvv --test-apk ${TEST_APK} -I --test_data ${TEST_DATA}
+      ${FLAGS} --test-apk ${TEST_APK} -I --test_data ${TEST_DATA}
 }
 
 # Run instrumentation tests for all relevant APKs on device.
 function bb_run_instrumentation_tests {
   bb_run_all_instrumentation_tests_for_apk "ContentShell.apk" \
       "org.chromium.content_shell" "ContentShellTest" \
       "content:content/test/data/android/device_files"
   bb_run_all_instrumentation_tests_for_apk "ChromiumTestShell.apk" \
       "org.chromium.chrome.testshell" "ChromiumTestShellTest" \
       "chrome:chrome/test/data/android/device_files"
@@ skipping 74 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', '')"
 }