Android: replace temporary test runner with the instrumentation runner.

Follow up from http://codereview.chromium.org/10826071/

BUG=139365
TEST=Android FYI tester runs instrumentation tests.


Review URL: https://chromiumcodereview.appspot.com/10828094

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149679 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 4 insertions, 31 deletions

diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh
index d493ff2..4fb5f28 100755
--- a/build/android/buildbot_functions.sh
+++ b/build/android/buildbot_functions.sh
@@ -254,13 +254,6 @@ function bb_run_tests {
   build/android/run_tests.py --xvfb --verbose
 }
 
-# Run simple content shell test on device.
-function bb_run_content_shell_test {
-  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 instrumentation test.
 # Args:
 #   $1: TEST_APK.
@@ -282,8 +275,9 @@ function bb_run_content_shell_instrumentation_test {
   build/android/adb_install_content_shell
   local TEST_APK="content_shell_test/ContentShellTest-debug"
   # 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} "-A SmallTest"
+  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"
 }
diff --git a/build/android/buildbot_fyi.sh b/build/android/buildbot_fyi.sh
deleted file mode 100755
index 4909c54..0000000
--- a/build/android/buildbot_fyi.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -ex
-# 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.
-#
-# Buildbot annotator script for the FYI waterfall.  Compile,
-# experimental compile, run tests, ...
-
-# SHERIFF: there should be no need to disable this bot.
-# The FYI waterfall does not close the tree.
-
-BB_SRC_ROOT="$(cd "$(dirname $0)/../.."; pwd)"
-. "${BB_SRC_ROOT}/build/android/buildbot_functions.sh"
-
-bb_baseline_setup "$BB_SRC_ROOT" "$@"
-bb_install_build_deps "$BB_SRC_ROOT"
-bb_compile
-bb_compile_experimental
-bb_run_tests
-bb_run_content_shell_test
diff --git a/build/android/buildbot_fyi_tester.sh b/build/android/buildbot_fyi_tester.sh
index 4adb077..86b4998 100755
--- a/build/android/buildbot_fyi_tester.sh
+++ b/build/android/buildbot_fyi_tester.sh
@@ -16,5 +16,4 @@ bb_baseline_setup "$BB_SRC_ROOT" "$@"
 bb_install_build_deps "$BB_SRC_ROOT"
 bb_extract_build
 bb_run_tests
-bb_run_content_shell_test
 bb_run_content_shell_instrumentation_test
diff --git a/build/android/buildbot_try_compile_test.sh b/build/android/buildbot_try_compile_test.sh
index 6898a35..53c3c6a 100755
--- a/build/android/buildbot_try_compile_test.sh
+++ b/build/android/buildbot_try_compile_test.sh
@@ -16,4 +16,4 @@ bb_baseline_setup "${ROOT}"/../..
 bb_install_build_deps "${ROOT}"/../..
 bb_compile
 bb_run_tests
-bb_run_content_shell_test
+bb_run_content_shell_instrumentation_test
diff --git a/build/android/buildbot_try_tester.sh b/build/android/buildbot_try_tester.sh
index fbcbe87..acbbf18 100755
--- a/build/android/buildbot_try_tester.sh
+++ b/build/android/buildbot_try_tester.sh
@@ -16,4 +16,4 @@ bb_baseline_setup "$BB_SRC_ROOT" "$@"
 bb_install_build_deps "$BB_SRC_ROOT"
 bb_extract_build
 bb_run_tests
-bb_run_content_shell_test
+bb_run_content_shell_instrumentation_test