sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-20 20:09:11 +00:00
Code Issues Releases Wiki Activity

adb_shell: handle zero stdout on error

Browse Source 
It looks like on recent systems, adb has started to correctly forward
stderr from the target device to stderr on the host (wereas in the past,
it got output to stdout on the host). This commit makes sure that
stderr gets correctly forwarded to the coller in cases where return code
checking was not enabled.
This commit is contained in:
Sergei Trofimov 2016-10-17 10:49:53 +01:00
parent fa7d89d734
commit 8355fcf886
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wlauto/utils/android.py
View File

@ -332,9 +332,13 @@ def adb_shell(device, command, timeout=None, check_exit_code=False, as_root=Fals
raise DeviceError('adb has returned early; did not get an exit code. Was kill-server invoked?')
else: # do not check exit code
try:
output, _ = check_output(full_command, timeout, shell=True)
output, error = check_output(full_command, timeout, shell=True)
if output is None:
output = error
elif error is not None:
output = '\n'.join([output, error])
except CalledProcessErrorWithStderr as e:
output = e.output
output = e.error or e.output
exit_code = e.returncode
if e.returncode == 1:
logger.debug("Got Exit code 1, could be either the return code of the command or mean ADB failed")