Index: build/android/buildbot/bb_device_steps.py |
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py |
index 3acc4c3134a8c93cbbd4164704dbceaeb296a44e..6b828eb49a5ac9118dcbaefa49d7b9c34837e3b0 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']) |
@@ -138,6 +138,15 @@ def RunTestSuites(options, suites): |
RunCmd(['build/android/run_tests.py', '-s', suite] + args) |
+def RunChromeDriverTests(): |
+ """Run all the steps for running chromedriver tests. |
Isaac (away)
2013/03/04 22:35:13
move triple code to line 142 (all on one line)
frankf
2013/03/04 23:18:11
Done.
|
+ |
+ """ |
+ buildbot_report.PrintNamedStep('chromedriver') |
Isaac (away)
2013/03/04 22:35:13
would 'chromedriver_tests' be more descriptive?
frankf
2013/03/04 23:18:11
This is very close to the name of one of the steps
|
+ 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. |
@@ -245,6 +254,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: |