diff options
| author | Pavel Labath <pavel@labath.sk> | 2019-02-13 13:06:37 +0000 |
|---|---|---|
| committer | Pavel Labath <pavel@labath.sk> | 2019-02-13 13:06:37 +0000 |
| commit | 3f27395322db8c296f10d8ca92a6d46801a6876d (patch) | |
| tree | 1465d3b5c3a8675647fd025cff2fe7cab66c9145 /lldb/packages/Python/lldbsuite | |
| parent | 61a301e64521c9ad69d1a9f0968d6a6e3ad4043e (diff) | |
| download | bcm5719-llvm-3f27395322db8c296f10d8ca92a6d46801a6876d.tar.gz bcm5719-llvm-3f27395322db8c296f10d8ca92a6d46801a6876d.zip | |
Revert "Fix one more string/bytes issue in lldb-server tests"
It looks like I was too hasty to submit the previous patch. It does fix
some tests on python3, but it also breaks one tests with python2.
This happens because the gdb-remote protocol can sometimes (but not very
often) contain binary data, and attempting to parse this as utf8
characters fails.
This reverts commit r353944.
llvm-svn: 353945
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py index db6b094da18..6f32dcacd35 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py @@ -174,7 +174,7 @@ class SocketPacketPump(object): can_read, _, _ = select.select([self._socket], [], [], 0) if can_read and self._socket in can_read: try: - new_bytes = self._socket.recv(4096).decode("utf-8") + new_bytes = self._socket.recv(4096) if self._logger and new_bytes and len(new_bytes) > 0: self._logger.debug( "pump received bytes: {}".format(new_bytes)) |
