diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 20:57:51 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 20:57:51 +0000 |
| commit | 2f32be54a88c6617aaf4aed5ba9461ff660ec743 (patch) | |
| tree | 2e01efce5ff9ee4a72373c8a37af98893f38f9ba /build | |
| parent | 9bb6767359a8d7835d23e3b54bccaba1bc90fcc5 (diff) | |
| download | chromium_src-2f32be54a88c6617aaf4aed5ba9461ff660ec743.zip chromium_src-2f32be54a88c6617aaf4aed5ba9461ff660ec743.tar.gz chromium_src-2f32be54a88c6617aaf4aed5ba9461ff660ec743.tar.bz2 | |
Install ContentShell.apk on android perf bot tester.
BUG=None
TEST=Manual on linux
Review URL: https://codereview.chromium.org/11412108
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/buildbot/bb_perf_gn_tests.sh | 2 | ||||
| -rwxr-xr-x | build/android/buildbot/buildbot_functions.sh | 20 |
2 files changed, 19 insertions, 3 deletions
diff --git a/build/android/buildbot/bb_perf_gn_tests.sh b/build/android/buildbot/bb_perf_gn_tests.sh index 49936d8..ba36b29 100755 --- a/build/android/buildbot/bb_perf_gn_tests.sh +++ b/build/android/buildbot/bb_perf_gn_tests.sh @@ -13,5 +13,5 @@ bb_baseline_setup "$BB_SRC_ROOT" "$@" bb_spawn_logcat_monitor_and_status bb_extract_build bb_reboot_phones -echo "@@@BUILD_STEP TODO: Perf tests@@@" +bb_install_apk "ContentShell.apk" "org.chromium.content_shell" bb_print_logcat diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh index d5c5940..6ab33dc1 100755 --- a/build/android/buildbot/buildbot_functions.sh +++ b/build/android/buildbot/buildbot_functions.sh @@ -294,6 +294,22 @@ function bb_run_step { ) } +# Install a specific APK. +# Args: +# $1: APK to be installed. +# $2: APK_PACKAGE for the APK to be installed. +function bb_install_apk { + local APK=${1} + local APK_PACKAGE=${2} + if [[ $BUILDTYPE = Release ]]; then + local BUILDFLAG="--release" + fi + + echo "@@@BUILD_STEP Install ${APK}@@@" + python build/android/adb_install_apk.py --apk ${APK} \ + --apk_package ${APK_PACKAGE} ${BUILDFLAG} +} + # Run instrumentation tests for a specific APK. # Args: # $1: APK to be installed. @@ -305,10 +321,10 @@ function bb_run_all_instrumentation_tests_for_apk { local TEST_APK=${3} # Install application APK. - python build/android/adb_install_apk.py --apk ${APK} \ - --apk_package ${APK_PACKAGE} + bb_install_apk ${APK} ${APK_PACKAGE} # Run instrumentation tests. Using -I to install the test apk. + echo "@@@BUILD_STEP Run instrumentation tests ${TEST_APK}@@@" bb_run_step python build/android/run_instrumentation_tests.py \ -vvv --test-apk ${TEST_APK} -I } |