summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2015-04-23 14:30:28 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 21:31:29 +0000
commitc4b6b651ef4a160314368d0fe7254bf71a04872d (patch)
tree539431ed5add66174a7aaaddc4971bafd76378e7 /build
parent1fac33fdb1dfb54fbad06fbd3f4cbbfd3d2e52cc (diff)
downloadchromium_src-c4b6b651ef4a160314368d0fe7254bf71a04872d.zip
chromium_src-c4b6b651ef4a160314368d0fe7254bf71a04872d.tar.gz
chromium_src-c4b6b651ef4a160314368d0fe7254bf71a04872d.tar.bz2
[Android] Fix buildbot scripts for components_browsertests.
BUG=465351 TBR=navabi@chromium.org Review URL: https://codereview.chromium.org/1103723003 Cr-Commit-Position: refs/heads/master@{#326648}
Diffstat (limited to 'build')
-rwxr-xr-xbuild/android/buildbot/bb_device_steps.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 0ea6dd2..e5df563 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)
@@ -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),