Adds AndroidWebView and ChromiumTestShell tests to the Android FYI bot.

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 189 matching lines @@
 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 {
   build/android/run_tests.py --xvfb --verbose
 }
 
-# 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"
-  INSTRUMENTATION_FLAGS+=" --test-apk ${TEST_APK}"
-  INSTRUMENTATION_FLAGS+=" ${EXTRA_FLAGS}"
-  build/android/run_instrumentation_tests.py ${INSTRUMENTATION_FLAGS}
+# Run a buildbot step and handle failure.
+function bb_run_step {
+  (
+  set +e
+  "$@"
+  if [[ $? != 0 ]]; then
+    echo "@@@STEP_FAILURE@@@"
+  fi
+  )
 }
 
-# Run content shell instrumentation test on device.
+# Run instrumentation tests for a specific APK.
+# Args:
+#   $1: APK to be installed.
+#   $2: APK_PACKAGE for the APK to be installed.
+#   $3: TEST_APK to run the tests against.
+function bb_run_all_instrumentation_tests_for_apk {
+  local APK=${1}
+  local APK_PACKAGE=${2}
+  local TEST_APK=${3}
+
+  # Install application APK.
+  python build/android/adb_install_apk.py --apk ${APK} \
+      --apk_package ${APK_PACKAGE}
+
+  # Run instrumentation tests. Using -I to install the test apk.
+  bb_run_step python build/android/run_instrumentation_tests.py \
+      -vvv --test-apk ${TEST_APK} -I
+}
+
+# Run instrumentation tests for all relevant APKs on device.
 function bb_run_instrumentation_tests {
-  build/android/adb_install_content_shell
-  local TEST_APK="ContentShellTest"
-  # Use -I to install the test apk only on the first run.
-  # TODO(bulach): remove the second once we have a Smoke test.
-  bb_run_instrumentation_test ${TEST_APK} "-I -A Smoke"
-  bb_run_instrumentation_test ${TEST_APK} "-I -A SmallTest"
-  bb_run_instrumentation_test ${TEST_APK} "-A MediumTest"
-  bb_run_instrumentation_test ${TEST_APK} "-A LargeTest"
+  bb_run_all_instrumentation_tests_for_apk "ContentShell-debug.apk" \
+      "org.chromium.content_shell" "ContentShellTest"
+  bb_run_all_instrumentation_tests_for_apk "ChromiumTestShell-debug.apk" \
+      "org.chromium.chrome.browser" "ChromiumTestShellTest"
+  bb_run_all_instrumentation_tests_for_apk "AndroidWebView-debug.apk" \
+      "org.chromium.android_webview" "AndroidWebViewTest"
 }
 
 # Zip and archive a build.
 function bb_zip_build {
   echo "@@@BUILD_STEP Zip build@@@"
   python ../../../../scripts/slave/zip_build.py \
     --src-dir "$SRC_ROOT" \
     --exclude-files "lib.target,gen,android_webview,jingle_unittests" \
     --factory-properties "$FACTORY_PROPERTIES" \
     --build-properties "$BUILD_PROPERTIES"
@@ skipping 56 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', '')"
 }