diff options
author | Elliott Hughes <enh@google.com> | 2015-08-19 03:37:23 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-19 03:37:23 +0000 |
commit | a169f3b40167df757b24464ceddcfc0e2f548c4f (patch) | |
tree | c9cd55c51e0de203e8689111f30a266e27f533d1 /adb | |
parent | d0cae5b9fead406c38df5dd55bd7d41fe22a6719 (diff) | |
parent | b7e79af048b35f528cadf2929950b402e0a2a46e (diff) | |
download | core-a169f3b40167df757b24464ceddcfc0e2f548c4f.tar.gz core-a169f3b40167df757b24464ceddcfc0e2f548c4f.tar.bz2 core-a169f3b40167df757b24464ceddcfc0e2f548c4f.zip |
Merge "adb: win32: fix unittest exit code parsing"
Diffstat (limited to 'adb')
-rw-r--r-- | adb/device.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/adb/device.py b/adb/device.py index bc1364b6d..5b33ff2fe 100644 --- a/adb/device.py +++ b/adb/device.py @@ -112,7 +112,8 @@ class AndroidDevice(object): _RETURN_CODE_PROBE_STRING = 'echo "{0}$?"'.format(_RETURN_CODE_DELIMITER) # Maximum search distance from the output end to find the delimiter. - _RETURN_CODE_SEARCH_LENGTH = len('{0}255\n'.format(_RETURN_CODE_DELIMITER)) + # adb on Windows returns \r\n even if adbd returns \n. + _RETURN_CODE_SEARCH_LENGTH = len('{0}255\r\n'.format(_RETURN_CODE_DELIMITER)) def __init__(self, serial, product=None): self.serial = serial |