Fix tests for the gdb-remote memory read packets

Part of TestGDBRemoteMemoryRead has been disabled since r259379 because it was incompatible with
python3. This changes the test to use the lldb-server test framework, which is a more appropriate
method of testing raw stub behaviour anyway (and should avoid the whole python 3 issue).

llvm-svn: 279039

diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
deleted file mode 100644 (file)
index 1296d51..0000000
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""
-Tests the binary ($x) and hex ($m) memory read packets of the remote stub
-"""
-
-from __future__ import print_function
-
-
-
-import binascii
-import os
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-from lldbsuite.test import lldbplatformutil
-
-
-class MemoryReadTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    @skipUnlessPlatform(lldbplatformutil.getDarwinOSTriples()+["linux"])
-    def test_memory_read(self):
-        self.build()
-        exe = os.path.join (os.getcwd(), "a.out")
-
-        target = self.dbg.CreateTarget(exe)
-        lldbutil.run_break_set_by_symbol(self, "main")
-
-        process = target.LaunchSimple (None, None, self.get_process_working_directory())
-        self.assertTrue(process, PROCESS_IS_VALID)
-        self.assertEqual(process.GetState(), lldb.eStateStopped, "Process is stopped")
-
-        pc = process.GetSelectedThread().GetSelectedFrame().GetPC()
-        for size in [1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024]:
-            error = lldb.SBError()
-            memory = process.ReadMemory(pc, size, error)
-            self.assertTrue(error.Success())
-            # Results in trying to write non-printable characters to the session log.
-            # self.match("process plugin packet send x%x,%x" % (pc, size), ["response:", memory])
-            self.match("process plugin packet send m%x,%x" % (pc, size), ["response:", binascii.hexlify(memory)])
-
-        process.Continue()
-        self.assertEqual(process.GetState(), lldb.eStateExited, "Process exited")

diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
index 201ff2c..b60d08d 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
@@ -1309,11 +1309,20 @@ class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
         # Hex-encode the test message, adding null termination.
         hex_encoded_message = TEST_MESSAGE.encode("hex")
 
-        # Write the message to the inferior.
+        # Write the message to the inferior. Verify that we can read it with the hex-encoded (m)
+        # and binary (x) memory read packets.
         self.reset_test_sequence()
         self.test_sequence.add_log_lines(
-            ["read packet: $M{0:x},{1:x}:{2}#00".format(message_address, len(hex_encoded_message)/2, hex_encoded_message),
+            ["read packet: $M{0:x},{1:x}:{2}#00".format(message_address, len(TEST_MESSAGE), hex_encoded_message),
              "send packet: $OK#00",
+             "read packet: $m{0:x},{1:x}#00".format(message_address, len(TEST_MESSAGE)),
+             "send packet: ${0}#00".format(hex_encoded_message),
+             "read packet: $x{0:x},{1:x}#00".format(message_address, len(TEST_MESSAGE)),
+             "send packet: ${0}#00".format(TEST_MESSAGE),
+             "read packet: $m{0:x},4#00".format(message_address),
+             "send packet: ${0}#00".format(hex_encoded_message[0:8]),
+             "read packet: $x{0:x},4#00".format(message_address),
+             "send packet: ${0}#00".format(TEST_MESSAGE[0:4]),
              "read packet: $c#63",
              { "type":"output_match", "regex":r"^message: (.+)\r\n$", "capture":{ 1:"printed_message"} },
              "send packet: $W00#00",