diff options
author | Pavel Labath <pavel@labath.sk> | 2019-07-01 12:41:20 +0000 |
---|---|---|
committer | Pavel Labath <pavel@labath.sk> | 2019-07-01 12:41:20 +0000 |
commit | 08c38f77c5fb4d3735ec215032fed8ee6730b3db (patch) | |
tree | 00d7467017e12830d7cd94fc3aa6ac10c749f53e /lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py | |
parent | 33c8c0ea2756f25f9914d328906debf20cfc49d5 (diff) | |
download | bcm5719-llvm-08c38f77c5fb4d3735ec215032fed8ee6730b3db.tar.gz bcm5719-llvm-08c38f77c5fb4d3735ec215032fed8ee6730b3db.zip |
Revert "Implement xfer:libraries-svr4:read packet"
D62502, together with D62503 have broken the builds which have XML
support enabled. Reverting D62503 (r364355) fixed that, but has broken
has left some of the tests introduced by D62502 broken more or less
nondeternimistically (it depended on whether the system happens to place
the library list near unreadable pages of memory). I attempted to make a
partial fix for this in r364748, but Jan Kratochvil pointed out that
this reintroduces the problem which reverting D62503 was trying to
solve.
So instead, I back out the whole thing so we can get back to a clean
slate that works for everyone. We can figure out a way forward from
there.
This reverts r364748, r363772 and r363707.
llvm-svn: 364751
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py')
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py index 8311e162399..e7c63bf21e8 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py @@ -513,8 +513,7 @@ class GdbRemoteTestCaseBase(TestBase): self, inferior_args=None, inferior_sleep_seconds=3, - inferior_exe_path=None, - inferior_env=None): + inferior_exe_path=None): """Prep the debug monitor, the inferior, and the expected packet stream. Handle the separate cases of using the debug monitor in attach-to-inferior mode @@ -577,9 +576,6 @@ class GdbRemoteTestCaseBase(TestBase): # Build the expected protocol stream self.add_no_ack_remote_stream() - if inferior_env: - for name, value in inferior_env.items(): - self.add_set_environment_packets(name, value) if self._inferior_startup == self._STARTUP_LAUNCH: self.add_verified_launch_packets(launch_args) @@ -660,12 +656,6 @@ class GdbRemoteTestCaseBase(TestBase): {"direction": "send", "regex": r"^\$(.+)#[0-9a-fA-F]{2}$", "capture": {1: "process_info_raw"}}], True) - def add_set_environment_packets(self, name, value): - self.test_sequence.add_log_lines( - ["read packet: $QEnvironment:" + name + "=" + value + "#00", - "send packet: $OK#00", - ], True) - _KNOWN_PROCESS_INFO_KEYS = [ "pid", "parent-pid", @@ -826,7 +816,6 @@ class GdbRemoteTestCaseBase(TestBase): "error"]) self.assertIsNotNone(val) - mem_region_dict["name"] = seven.unhexlify(mem_region_dict.get("name", "")) # Return the dictionary of key-value pairs for the memory region. return mem_region_dict @@ -1011,22 +1000,6 @@ class GdbRemoteTestCaseBase(TestBase): return context - def continue_process_and_wait_for_stop(self): - self.test_sequence.add_log_lines( - [ - "read packet: $vCont;c#a8", - { - "direction": "send", - "regex": r"^\$T([0-9a-fA-F]{2})(.*)#[0-9a-fA-F]{2}$", - "capture": {1: "stop_signo", 2: "stop_key_val_text"}, - }, - ], - True, - ) - context = self.expect_gdbremote_sequence() - self.assertIsNotNone(context) - return self.parse_interrupt_packets(context) - def select_modifiable_register(self, reg_infos): """Find a register that can be read/written freely.""" PREFERRED_REGISTER_NAMES = set(["rax", ]) |