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 c9be13a045d26f404da1a804365f67c11fd52bb8..e5df563c5f46bf257f94814c3aa1ca828fa3309b 100755 |
--- a/build/android/buildbot/bb_device_steps.py |
+++ b/build/android/buildbot/bb_device_steps.py |
@@ -94,9 +94,10 @@ INSTALLABLE_PACKAGES = dict((package.name, package) for package in ( |
'ChromeDriverWebViewShell.apk', |
'org.chromium.chromedriver_webview_shell')])) |
-VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'gpu', |
- 'telemetry_unittests', 'telemetry_perf_unittests', 'ui', |
- 'unit', 'webkit', 'webkit_layout', 'python_unittests']) |
+VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'components_browsertests', |
+ 'gpu', 'python_unittests', 'telemetry_unittests', |
+ 'telemetry_perf_unittests', 'ui', 'unit', 'webkit', |
+ 'webkit_layout']) |
RunCmd = bb_utils.RunCmd |
@@ -172,7 +173,7 @@ def RunTestSuites(options, suites, suites_options=None): |
bb_annotations.PrintNamedStep(suite) |
cmd = [suite] + args |
cmd += suites_options.get(suite, []) |
- if suite == 'content_browsertests': |
+ if suite == 'content_browsertests' or suite == 'components_browsertests': |
cmd.append('--num_retries=1') |
_RunTest(options, cmd, suite) |
@@ -315,7 +316,7 @@ def RunWebkitLayoutTests(options): |
'--build-name', options.build_properties.get('buildername', ''), |
'--platform=android'] |
- for flag in 'test_results_server', 'driver_name', 'additional_drt_flag': |
+ for flag in 'test_results_server', 'driver_name', 'additional_driver_flag': |
if flag in options.factory_properties: |
cmd_args.extend(['--%s' % flag.replace('_', '-'), |
options.factory_properties.get(flag)]) |
@@ -557,6 +558,8 @@ def GetTestStepCmds(): |
return [ |
('chromedriver', RunChromeDriverTests), |
('chrome_proxy', RunChromeProxyTests), |
+ ('components_browsertests', |
+ lambda options: RunTestSuites(options, ['components_browsertests'])), |
('gpu', RunGPUTests), |
('python_unittests', RunPythonUnitTests), |
('telemetry_unittests', RunTelemetryUnitTests), |