diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 00:19:23 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 00:19:23 +0000 |
| commit | 83670506a24cb7ae95e1b069262734cb8adb0f6d (patch) | |
| tree | 2d9024bd5e4bfe02534c0278d4c714e767c2754a /build | |
| parent | 6d8ec3ce11731c052c8720f6683b95f5aa6cec30 (diff) | |
| download | chromium_src-83670506a24cb7ae95e1b069262734cb8adb0f6d.zip chromium_src-83670506a24cb7ae95e1b069262734cb8adb0f6d.tar.gz chromium_src-83670506a24cb7ae95e1b069262734cb8adb0f6d.tar.bz2 | |
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: svn://svn.chromium.org/chrome/trunk/src@168652 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/buildbot/bb_fyi_tester.sh | 1 | ||||
| -rwxr-xr-x | build/android/buildbot/bb_main_tester.sh | 1 | ||||
| -rwxr-xr-x | build/android/buildbot/bb_try_tester.sh | 1 | ||||
| -rwxr-xr-x | build/android/buildbot/buildbot_functions.sh | 4 |
4 files changed, 7 insertions, 0 deletions
diff --git a/build/android/buildbot/bb_fyi_tester.sh b/build/android/buildbot/bb_fyi_tester.sh index 739504c..e50a32b 100755 --- a/build/android/buildbot/bb_fyi_tester.sh +++ b/build/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/build/android/buildbot/bb_main_tester.sh b/build/android/buildbot/bb_main_tester.sh index d5cac80..287d281 100755 --- a/build/android/buildbot/bb_main_tester.sh +++ b/build/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/build/android/buildbot/bb_try_tester.sh b/build/android/buildbot/bb_try_tester.sh index 3a90f45..bfbff27 100755 --- a/build/android/buildbot/bb_try_tester.sh +++ b/build/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/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh index 9f56a18..d5c5940 100755 --- a/build/android/buildbot/buildbot_functions.sh +++ b/build/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" } |