diff options
| author | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 00:27:16 +0000 |
|---|---|---|
| committer | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 00:27:16 +0000 |
| commit | d8897f6c77ac04e0f9d631e7bbce566ae90ae016 (patch) | |
| tree | 813ec4d378a48dabee8f3196a0093da3b73bfb8b /build/android/buildbot | |
| parent | 34e5cda6f000083f60b3b0e79c9567f2ae02f7b5 (diff) | |
| download | chromium_src-d8897f6c77ac04e0f9d631e7bbce566ae90ae016.zip chromium_src-d8897f6c77ac04e0f9d631e7bbce566ae90ae016.tar.gz chromium_src-d8897f6c77ac04e0f9d631e7bbce566ae90ae016.tar.bz2 | |
[Android] Run chromedriver tests on 'Android ChromeDriver Tests (dbg)' bot.
NOTRY=True
BUG=175558
Review URL: https://chromiumcodereview.appspot.com/12387097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/buildbot')
| -rwxr-xr-x | build/android/buildbot/bb_device_steps.py | 11 | ||||
| -rwxr-xr-x | build/android/buildbot/bb_run_bot.py | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py index e33046e..0743b53 100755 --- a/build/android/buildbot/bb_device_steps.py +++ b/build/android/buildbot/bb_device_steps.py @@ -59,7 +59,7 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [ None), ]) -VALID_TESTS = set(['ui', 'unit', 'webkit', 'webkit_layout']) +VALID_TESTS = set(['chromedriver', 'ui', 'unit', 'webkit', 'webkit_layout']) @@ -151,6 +151,13 @@ def RunBrowserTestSuite(options): buildbot_report.PrintNamedStep(constants.BROWSERTEST_SUITE_NAME) RunCmd(['build/android/run_browser_tests.py'] + args) +def RunChromeDriverTests(): + """Run all the steps for running chromedriver tests.""" + buildbot_report.PrintNamedStep('chromedriver_annotation') + RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py', + '--android-package=%s' % constants.CHROMIUM_TEST_SHELL_PACKAGE]) + + def InstallApk(options, test, print_step=False): """Install an apk to all phones. @@ -258,6 +265,8 @@ def MainTestWrapper(options): test_obj = INSTRUMENTATION_TESTS[options.install] InstallApk(options, test_obj, print_step=True) + if 'chromedriver' in options.test_filter: + RunChromeDriverTests() if 'unit' in options.test_filter: RunTestSuites(options, gtest_config.STABLE_TEST_SUITES) if 'ui' in options.test_filter: diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py index d46619e..c623f66 100755 --- a/build/android/buildbot/bb_run_bot.py +++ b/build/android/buildbot/bb_run_bot.py @@ -91,6 +91,8 @@ def GetBotStepMap(): B('asan-builder', std_build_steps, None, None), B('asan-tests', std_test_steps + ['bb_asan_tests_setup'], T(std_tests, ['--asan']), None), + B('chromedriver-fyi-tests-dbg', std_test_steps, T(['chromedriver']), + None), B('fyi-builder-dbg', ['bb_check_webview_licenses', 'bb_compile', 'bb_compile_experimental', 'bb_run_findbugs', 'bb_zip_build'], None, None), |