From: Jordan Rupprecht Date: Thu, 30 Jul 2020 17:25:28 +0000 (-0700) Subject: [lldb][test] Move registers-target-xml-reading target to the correct test location. X-Git-Tag: llvmorg-13-init~16256 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be198e03ebba264baadfd2ed383b1725633c43ea;p=platform%2Fupstream%2Fllvm.git [lldb][test] Move registers-target-xml-reading target to the correct test location. This test was added in D74217 (and the `.categories` file later added in ccf1c30cde6e1e763e7c9cdd48a609a805166699) around the same time I moved the test tree from `lldb/packages/Python/lldbsuite/test` to `lldb/test/API` (D71151). Since this got lost in the move, it isn't running. (I introduced an intentional syntax error, and `ninja check-lldb` passes). I moved it to the correct location, and now it runs and passes -- locally, at least -- as `ninja check-lldb-api-tools-lldb-server-registers-target-xml-reading`. --- diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/.categories b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/.categories deleted file mode 100644 index 1966eb022b49..000000000000 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/.categories +++ /dev/null @@ -1 +0,0 @@ -lldb-server diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/registers-target-xml-reading/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/registers-target-xml-reading/Makefile deleted file mode 100644 index 99998b20bcb0..000000000000 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/registers-target-xml-reading/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXX_SOURCES := main.cpp - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py deleted file mode 100644 index 530e2ce80023..000000000000 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py +++ /dev/null @@ -1,69 +0,0 @@ - - -import gdbremote_testcase -import textwrap -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil -import re -import xml.etree.ElementTree as ET - -class TestGdbRemoteTargetXmlPacket(gdbremote_testcase.GdbRemoteTestCaseBase): - - mydir = TestBase.compute_mydir(__file__) - - @expectedFailureNetBSD - @llgs_test - def test_g_target_xml_returns_correct_data(self): - self.init_llgs_test() - self.build() - self.set_inferior_startup_launch() - - procs = self.prep_debug_monitor_and_inferior() - - OFFSET = 0 - LENGTH = 0x1ffff0 - self.test_sequence.add_log_lines([ - "read packet: $qXfer:features:read:target.xml:{:x},{:x}#00".format( - OFFSET, - LENGTH), - { - "direction": "send", - "regex": re.compile("^\$l(.+)#[0-9a-fA-F]{2}$"), - "capture": {1: "target_xml"} - }], - True) - context = self.expect_gdbremote_sequence() - - target_xml = context.get("target_xml") - - root = ET.fromstring(target_xml) - self.assertIsNotNone(root) - self.assertEqual(root.tag, "target") - - architecture = root.find("architecture") - self.assertIsNotNone(architecture) - self.assertEqual(architecture.text, self.getArchitecture()) - - feature = root.find("feature") - self.assertIsNotNone(feature) - - target_xml_registers = feature.findall("reg") - self.assertTrue(len(target_xml_registers) > 0) - - # registers info collected by qRegisterInfo - self.add_register_info_collection_packets() - context = self.expect_gdbremote_sequence() - self.assertIsNotNone(context) - q_info_registers = self.parse_register_info_packets(context) - - self.assertTrue(len(target_xml_registers) == len(q_info_registers)) - for register in zip(target_xml_registers, q_info_registers): - xml_info_reg = register[0] - q_info_reg = register[1] - self.assertEqual(q_info_reg["name"], xml_info_reg.get("name")) - self.assertEqual(q_info_reg["set"], xml_info_reg.get("group")) - self.assertEqual(q_info_reg["format"], xml_info_reg.get("format")) - self.assertEqual(q_info_reg["bitsize"], xml_info_reg.get("bitsize")) - self.assertEqual(q_info_reg["offset"], xml_info_reg.get("offset")) - self.assertEqual(q_info_reg["encoding"], xml_info_reg.get("encoding")) \ No newline at end of file diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/registers-target-xml-reading/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/registers-target-xml-reading/main.cpp deleted file mode 100644 index 237c8ce18177..000000000000 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/registers-target-xml-reading/main.cpp +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/lldb/test/API/tools/lldb-server/.categories b/lldb/test/API/tools/lldb-server/.categories new file mode 100644 index 000000000000..1966eb022b49 --- /dev/null +++ b/lldb/test/API/tools/lldb-server/.categories @@ -0,0 +1 @@ +lldb-server diff --git a/lldb/test/API/tools/lldb-server/registers-target-xml-reading/Makefile b/lldb/test/API/tools/lldb-server/registers-target-xml-reading/Makefile new file mode 100644 index 000000000000..99998b20bcb0 --- /dev/null +++ b/lldb/test/API/tools/lldb-server/registers-target-xml-reading/Makefile @@ -0,0 +1,3 @@ +CXX_SOURCES := main.cpp + +include Makefile.rules diff --git a/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py b/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py new file mode 100644 index 000000000000..51f3d3595640 --- /dev/null +++ b/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py @@ -0,0 +1,69 @@ + + +import gdbremote_testcase +import textwrap +from lldbsuite.test.decorators import * +from lldbsuite.test.lldbtest import * +from lldbsuite.test import lldbutil +import re +import xml.etree.ElementTree as ET + +class TestGdbRemoteTargetXmlPacket(gdbremote_testcase.GdbRemoteTestCaseBase): + + mydir = TestBase.compute_mydir(__file__) + + @expectedFailureNetBSD + @llgs_test + def test_g_target_xml_returns_correct_data(self): + self.init_llgs_test() + self.build() + self.set_inferior_startup_launch() + + procs = self.prep_debug_monitor_and_inferior() + + OFFSET = 0 + LENGTH = 0x1ffff0 + self.test_sequence.add_log_lines([ + "read packet: $qXfer:features:read:target.xml:{:x},{:x}#00".format( + OFFSET, + LENGTH), + { + "direction": "send", + "regex": re.compile("^\$l(.+)#[0-9a-fA-F]{2}$"), + "capture": {1: "target_xml"} + }], + True) + context = self.expect_gdbremote_sequence() + + target_xml = context.get("target_xml") + + root = ET.fromstring(target_xml) + self.assertIsNotNone(root) + self.assertEqual(root.tag, "target") + + architecture = root.find("architecture") + self.assertIsNotNone(architecture) + self.assertEqual(architecture.text, self.getArchitecture()) + + feature = root.find("feature") + self.assertIsNotNone(feature) + + target_xml_registers = feature.findall("reg") + self.assertTrue(len(target_xml_registers) > 0) + + # registers info collected by qRegisterInfo + self.add_register_info_collection_packets() + context = self.expect_gdbremote_sequence() + self.assertIsNotNone(context) + q_info_registers = self.parse_register_info_packets(context) + + self.assertTrue(len(target_xml_registers) == len(q_info_registers)) + for register in zip(target_xml_registers, q_info_registers): + xml_info_reg = register[0] + q_info_reg = register[1] + self.assertEqual(q_info_reg["name"], xml_info_reg.get("name")) + self.assertEqual(q_info_reg["set"], xml_info_reg.get("group")) + self.assertEqual(q_info_reg["format"], xml_info_reg.get("format")) + self.assertEqual(q_info_reg["bitsize"], xml_info_reg.get("bitsize")) + self.assertEqual(q_info_reg["offset"], xml_info_reg.get("offset")) + self.assertEqual(q_info_reg["encoding"], xml_info_reg.get("encoding")) diff --git a/lldb/test/API/tools/lldb-server/registers-target-xml-reading/main.cpp b/lldb/test/API/tools/lldb-server/registers-target-xml-reading/main.cpp new file mode 100644 index 000000000000..237c8ce18177 --- /dev/null +++ b/lldb/test/API/tools/lldb-server/registers-target-xml-reading/main.cpp @@ -0,0 +1 @@ +int main() {}