[Lldb-commits] [lldb] r232805 - Fix ninja check-lldb

Pavel Labath labath at google.com
Fri Mar 20 04:24:36 PDT 2015


Author: labath
Date: Fri Mar 20 06:24:36 2015
New Revision: 232805

URL: http://llvm.org/viewvc/llvm-project?rev=232805&view=rev
Log:
Fix ninja check-lldb

Ninja apparently has issues with commands writing nul characters '\0' to stdout. When it
encounters a nul character, the rest of the output is skipped (I will file a bug with ninja about
that). This breaks the linux buildbot since it parses the ninja check-lldb output to get a list
of failures.

Recently, we have started outputting nul characters in lldb-server tests. This is probably
a bug in itself, but I am not addressing that now. This is just a workaround commit, which
prevents the nul characters from appearing in the output, and gets the buildbot operational again.

Modified:
    lldb/trunk/test/tools/lldb-server/socket_packet_pump.py

Modified: lldb/trunk/test/tools/lldb-server/socket_packet_pump.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-server/socket_packet_pump.py?rev=232805&r1=232804&r2=232805&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-server/socket_packet_pump.py (original)
+++ lldb/trunk/test/tools/lldb-server/socket_packet_pump.py Fri Mar 20 06:24:36 2015
@@ -3,6 +3,7 @@ import re
 import select
 import threading
 import traceback
+import codecs
 
 def _handle_output_packet_string(packet_contents):
     if (not packet_contents) or (len(packet_contents) < 1):
@@ -16,7 +17,7 @@ def _handle_output_packet_string(packet_
 
 def _dump_queue(the_queue):
     while not the_queue.empty():
-        print the_queue.get(True)
+        print codecs.encode(the_queue.get(True), "string_escape")
         print "\n"
 
 class SocketPacketPump(object):





More information about the lldb-commits mailing list