Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: build/android/buildbot/bb_device_steps.py

Issue 235573010: Add telemetry tests to Android tester. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix presubmit error by running script and letting it fail. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/buildbot/bb_run_bot.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 61927d8b1c1112a6ac46c8382a41e5ed04fd06fd..10dfa15111312107b0a2edc9b89fb26db67c3fd8 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -78,8 +78,9 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
'webview:android_webview/test/data/device_files'),
])
-VALID_TESTS = set(['chromedriver', 'gpu', 'ui', 'unit', 'webkit',
- 'webkit_layout', 'webrtc_chromium', 'webrtc_native'])
+VALID_TESTS = set(['chromedriver', 'gpu', 'telemetry_perf_unittests',
+ 'ui', 'unit', 'webkit', 'webkit_layout', 'webrtc_chromium',
+ 'webrtc_native'])
RunCmd = bb_utils.RunCmd
@@ -165,6 +166,21 @@ def RunChromeDriverTests(options):
'--update-log'])
+def RunTelemetryPerfUnitTests(options):
+ """Runs the telemetry perf unit tests.
+
+ Args:
+ options: options object.
+ """
+ InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False)
+ args = ['--browser', 'android-chromium-testshell']
+ devices = android_commands.GetAttachedDevices()
+ if devices:
+ args = args + ['--device', devices[0]]
+ bb_annotations.PrintNamedStep('telemetry_perf_unittests')
+ RunCmd(['tools/perf/run_tests'] + args)
+
+
def InstallApk(options, test, print_step=False):
"""Install an apk to all phones.
@@ -481,6 +497,7 @@ def GetTestStepCmds():
return [
('chromedriver', RunChromeDriverTests),
('gpu', RunGPUTests),
+ ('telemetry_perf_unittests', RunTelemetryPerfUnitTests),
('unit', RunUnitTests),
('ui', RunInstrumentationTests),
('webkit', RunWebkitTests),
« no previous file with comments | « no previous file | build/android/buildbot/bb_run_bot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698