From 43ab82c562b4b1c22d2ace3cced4cf310a99f206 Mon Sep 17 00:00:00 2001 From: Todd Fiala Date: Sun, 15 Jun 2014 23:33:09 +0000 Subject: [PATCH] Minor gdb-remote test QListThreadsInStopReply changes from llgs branch. llvm-svn: 211006 --- .../lldb-gdbserver/TestGdbRemoteThreadsInStopReply.py | 11 ++++++----- lldb/test/tools/lldb-gdbserver/gdbremote_testcase.py | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteThreadsInStopReply.py b/lldb/test/tools/lldb-gdbserver/TestGdbRemoteThreadsInStopReply.py index 2132d19e8dea..e6a664a20659 100644 --- a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteThreadsInStopReply.py +++ b/lldb/test/tools/lldb-gdbserver/TestGdbRemoteThreadsInStopReply.py @@ -43,9 +43,10 @@ class TestGdbRemoteThreadsInStopReply(gdbremote_testcase.GdbRemoteTestCaseBase): self.assertIsNotNone(threads) self.assertEquals(len(threads), thread_count) - # Stop the process, grab the stop reply content. + # Run, then stop the process, grab the stop reply content. self.reset_test_sequence() self.test_sequence.add_log_lines([ + "read packet: $c#00", "read packet: {}".format(chr(03)), {"direction":"send", "regex":r"^\$T([0-9a-fA-F]+)([^#]+)#[0-9a-fA-F]{2}$", "capture":{1:"stop_result", 2:"key_vals_text"} }, ], True) @@ -111,18 +112,18 @@ class TestGdbRemoteThreadsInStopReply(gdbremote_testcase.GdbRemoteTestCaseBase): self.set_inferior_startup_launch() self.stop_reply_reports_multiple_threads(5) - def no_QThreadsInStopReply_supplies_no_threads(self, thread_count): + def no_QListThreadsInStopReply_supplies_no_threads(self, thread_count): # Gather threads from stop notification when QThreadsInStopReply is not enabled. stop_reply_threads = self.gather_stop_reply_threads(None, thread_count) self.assertEquals(len(stop_reply_threads), 0) @debugserver_test @dsym_test - def test_no_QThreadsInStopReply_supplies_no_threads_debugserver_dsym(self): + def test_no_QListThreadsInStopReply_supplies_no_threads_debugserver_dsym(self): self.init_debugserver_test() self.buildDsym() self.set_inferior_startup_launch() - self.no_QThreadsInStopReply_supplies_no_threads(5) + self.no_QListThreadsInStopReply_supplies_no_threads(5) @llgs_test @dwarf_test @@ -131,7 +132,7 @@ class TestGdbRemoteThreadsInStopReply(gdbremote_testcase.GdbRemoteTestCaseBase): self.init_llgs_test() self.buildDwarf() self.set_inferior_startup_launch() - self.no_QThreadsInStopReply_supplies_no_threads(5) + self.no_QListThreadsInStopReply_supplies_no_threads(5) def stop_reply_reports_correct_threads(self, thread_count): # Gather threads from stop notification when QThreadsInStopReply is enabled. diff --git a/lldb/test/tools/lldb-gdbserver/gdbremote_testcase.py b/lldb/test/tools/lldb-gdbserver/gdbremote_testcase.py index a937f228eaf6..954cf32b7c98 100644 --- a/lldb/test/tools/lldb-gdbserver/gdbremote_testcase.py +++ b/lldb/test/tools/lldb-gdbserver/gdbremote_testcase.py @@ -470,6 +470,7 @@ class GdbRemoteTestCaseBase(TestBase): "PacketSize", "QStartNoAckMode", "QThreadSuffixSupported", + "QListThreadsInStopReply", "qXfer:auxv:read", "qXfer:libraries:read", "qXfer:libraries-svr4:read",