From 57a4a7168e0adad9909609c114f5a379c9769619 Mon Sep 17 00:00:00 2001 From: "yfriedman@chromium.org" Date: Tue, 20 Nov 2012 00:19:23 +0000 Subject: [PATCH] Move ContentShell and ChromiumTestShell instrumentation tests to main waterfall. These are non-flaky and we have sufficient capacity. NOTRY=true Review URL: https://codereview.chromium.org/11412079 git-svn-id: http://src.chromium.org/svn/trunk/src/build@168652 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- android/buildbot/bb_fyi_tester.sh | 1 + android/buildbot/bb_main_tester.sh | 1 + android/buildbot/bb_try_tester.sh | 1 + android/buildbot/buildbot_functions.sh | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/android/buildbot/bb_fyi_tester.sh b/android/buildbot/bb_fyi_tester.sh index 739504cb5..e50a32b19 100755 --- a/android/buildbot/bb_fyi_tester.sh +++ b/android/buildbot/bb_fyi_tester.sh @@ -17,4 +17,5 @@ bb_reboot_phones bb_run_unit_tests bb_run_instrumentation_tests bb_run_experimental_unit_tests +bb_run_experimental_instrumentation_tests bb_print_logcat diff --git a/android/buildbot/bb_main_tester.sh b/android/buildbot/bb_main_tester.sh index d5cac8031..287d28146 100755 --- a/android/buildbot/bb_main_tester.sh +++ b/android/buildbot/bb_main_tester.sh @@ -19,4 +19,5 @@ bb_spawn_logcat_monitor_and_status bb_extract_build bb_reboot_phones bb_run_unit_tests +bb_run_instrumentation_tests bb_print_logcat diff --git a/android/buildbot/bb_try_tester.sh b/android/buildbot/bb_try_tester.sh index 3a90f45c3..bfbff27ea 100755 --- a/android/buildbot/bb_try_tester.sh +++ b/android/buildbot/bb_try_tester.sh @@ -18,4 +18,5 @@ bb_spawn_logcat_monitor_and_status bb_extract_build bb_reboot_phones bb_run_unit_tests +bb_run_instrumentation_tests bb_print_logcat diff --git a/android/buildbot/buildbot_functions.sh b/android/buildbot/buildbot_functions.sh index 9f56a18e5..d5c594083 100755 --- a/android/buildbot/buildbot_functions.sh +++ b/android/buildbot/buildbot_functions.sh @@ -319,6 +319,10 @@ function bb_run_instrumentation_tests { "org.chromium.content_shell" "ContentShellTest" bb_run_all_instrumentation_tests_for_apk "ChromiumTestShell.apk" \ "org.chromium.chrome.testshell" "ChromiumTestShellTest" +} + +# Run instrumentation tests for experimental APKs on device. +function bb_run_experimental_instrumentation_tests { bb_run_all_instrumentation_tests_for_apk "AndroidWebView.apk" \ "org.chromium.android_webview" "AndroidWebViewTest" }