| 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 8ff5a20ad63ac52922295728e8baaff4d1c3e8d6..09292ce2b66108cc8ac3c5b1da10072abfa0d55f 100755
|
| --- a/build/android/buildbot/bb_device_steps.py
|
| +++ b/build/android/buildbot/bb_device_steps.py
|
| @@ -74,7 +74,7 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
|
| 'webview:android_webview/test/data/device_files'),
|
| ])
|
|
|
| -VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'gpu', 'mojo',
|
| +VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'gpu', 'mojo', 'sync',
|
| 'telemetry_perf_unittests', 'ui', 'unit', 'webkit',
|
| 'webkit_layout', 'webrtc_chromium', 'webrtc_native'])
|
|
|
| @@ -180,6 +180,15 @@ def RunChromeProxyTests(options):
|
| bb_annotations.PrintNamedStep('chrome_proxy')
|
| RunCmd(['tools/chrome_proxy/run_tests'] + args)
|
|
|
| +def RunChromeSyncShellTests(options):
|
| + """Run the chrome sync shell tests"""
|
| + test = I('ChromeSyncShell',
|
| + 'ChromeSyncShell.apk',
|
| + 'org.chromium.chrome.browser.sync',
|
| + 'ChromeSyncShellTest.apk',
|
| + 'chrome:chrome/test/data/android/device_files')
|
| + RunInstrumentationSuite(options, test)
|
| +
|
| def RunTelemetryPerfUnitTests(options):
|
| """Runs the telemetry perf unit tests.
|
|
|
| @@ -538,9 +547,10 @@ def GetTestStepCmds():
|
| ('chrome_proxy', RunChromeProxyTests),
|
| ('gpu', RunGPUTests),
|
| ('mojo', RunMojoTests),
|
| + ('sync', RunChromeSyncShellTests),
|
| ('telemetry_perf_unittests', RunTelemetryPerfUnitTests),
|
| - ('unit', RunUnitTests),
|
| ('ui', RunInstrumentationTests),
|
| + ('unit', RunUnitTests),
|
| ('webkit', RunWebkitTests),
|
| ('webkit_layout', RunWebkitLayoutTests),
|
| ('webrtc_chromium', RunWebRTCChromiumTests),
|
|
|