Android: adds instrumentation tests on the FYI bot.

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 237 matching lines @@
 }
 
 # 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 {

[Yaron, 2012/07/30 21:41:53]

Can you remove this one? We've opted to replace it with real instrumentation
tests as this one is flaky and basically a temporary stand-in for what you're
doing.

[bulach, 2012/07/30 21:50:03]

this function is already called by the try bots, which I think runs for the CQ,
right?

would it be ok to do this cleanup as a separate step?

ideally, we'd leave this for a day or two, then graduate / replace the old one
once it proves stable.. how does it sound?

I mean, if it's already really flaky :) I'm happy to remove it right now, but
otherwise I'd prefer to be a bit more conservative..

   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
 }
 
+# Run content shell instrumentation test on device.
+function bb_run_content_shell_instrumentation_test {
+  echo "@@@BUILD_STEP Run content shell instrumentation test on actual "\
+       "hardware@@@"
+  build/android/run_instrumentation_tests.py -I \
+      --test-apk content_shell_test/ContentShellTest-debug -vvv
+}
+
 # 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" \
     --factory-properties "$FACTORY_PROPERTIES" \
     --build-properties "$BUILD_PROPERTIES"
 }
 
@@ skipping 18 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
   )
 }