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 26708cd1c9346cc7e41a882989c7514fb6120544..19dce741542bb85b0a908f7df2f3c85e3bed96ab 100755 |
--- a/build/android/buildbot/bb_device_steps.py |
+++ b/build/android/buildbot/bb_device_steps.py |
@@ -402,7 +402,8 @@ def ProvisionDevices(options): |
adb.RestartAdbServer() |
RunCmd(['sleep', '1']) |
- if options.reboot: |
+ # Can not reboot s3 devices because WaitForPackageManager is broken. |
+ if not options.s3_devices: |
RebootDevices() |
provision_cmd = ['build/android/provision_devices.py', '-t', options.target] |
if options.auto_reconnect: |
@@ -577,8 +578,8 @@ def GetDeviceStepsOptParser(): |
parser.add_option('--asan', action='store_true', help='Run tests with asan.') |
parser.add_option('--install', metavar='<apk name>', |
help='Install an apk by name') |
- parser.add_option('--reboot', action='store_true', |
- help='Reboot devices before running tests') |
+ parser.add_option('--s3-devices', action='store_true', |
bulach
2014/01/07 15:43:09
from the other patch: it'd be better to keep --reb
|
+ help='Samsung s3 devices on bot.') |
parser.add_option('--coverage-bucket', |
help=('Bucket name to store coverage results. Coverage is ' |
'only run if this is set.')) |