Run APK tests on the android_test trybot.

build/android/buildbot_functions.sh

Index: build/android/buildbot_functions.sh
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh
index 2ea50f396be91a6be873e84564205a5b10480caf..1db548eab695a34ee201e641068f4bffd730fc3d 100755
--- a/build/android/buildbot_functions.sh
+++ b/build/android/buildbot_functions.sh
@@ -194,23 +194,12 @@ function bb_compile {
 # Re-gyp and compile with unit test bundles configured as shlibs for
 # the native test runner.  Experimental for now.  Once the native test
 # loader is on by default, this entire function becomes obsolete.
-function bb_native_test_compile_run_tests {
+function bb_compile_apk_tests {
   echo "@@@BUILD_STEP Re-gyp for the native test runner@@@"
   GYP_DEFINES="$GYP_DEFINES gtest_target_type=shared_library" android_gyp
 
   echo "@@@BUILD_STEP Native test runner compile@@@"
   bb_goma_make
-
-  # Make sure running the template prints an expected failure.
-  echo "@@@BUILD_STEP Native test runner template test@@@"
-  tempfile=/tmp/tempfile-$$.txt
-  build/android/run_tests.py --xvfb --verbose \
-    -s out/Release/replaceme_apk/replaceme-debug.apk \
-    | sed 's/@@@STEP_FAILURE@@@//g' | tee $tempfile
-  happy_failure=$(cat $tempfile | grep RUNNER_FAILED | wc -l)
-  if [[ $happy_failure -eq 0 ]] ; then
-    echo "@@@STEP_WARNINGS@@@"
-  fi
 }
 
 # Experimental compile step; does not turn the tree red if it fails.
@@ -239,3 +228,17 @@ function bb_run_tests {
   echo "@@@BUILD_STEP Run Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose
 }
+
+# Run APK tests on an actual device.
+function bb_run_apk_tests {
+  echo "@@@BUILD_STEP Run APK Tests on actual hardware@@@"
+  tempfile=/tmp/tempfile-$$.txt
+  # Filter out STEP_FAILURES, we don't want REDNESS on test failures for now.
+  build/android/run_tests.py --xvfb --verbose --apk=True \
+    | sed 's/@@@STEP_FAILURE@@@//g' | tee $tempfile
+  happy_failure=$(cat $tempfile | grep RUNNER_FAILED | wc -l)
+  if [[ $happy_failure -eq 0 ]] ; then
+    echo "@@@STEP_WARNINGS@@@"
+  fi
+  rm -f $tempfile
+}