mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2024-03-26-1'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-03-26 11:07:35 -04:00
parent b070f86b4d 2e27ca3dbb
commit d63d35878b
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/commands.py
View File

@@ -1416,15 +1416,13 @@ def put_processes():
def put_state(event_process): def put_state(event_process):
STATE.require_no_tx()
STATE.tx = STATE.require_trace().start_tx("state", undoable=False)
ipath = PROCESS_PATTERN.format(procnum=event_process.GetProcessID()) ipath = PROCESS_PATTERN.format(procnum=event_process.GetProcessID())
procobj = STATE.trace.create_object(ipath) with STATE.client.batch():
state = "STOPPED" if event_process.is_stopped else "RUNNING" with STATE.require_trace().open_tx('State'):
procobj.set_value('_state', state) procobj = STATE.trace.create_object(ipath)
procobj.insert() state = "STOPPED" if event_process.is_stopped else "RUNNING"
STATE.require_tx().commit() procobj.set_value('_state', state)
STATE.reset_tx() procobj.insert()
@convert_errors @convert_errors

2
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbCommandsTest.java
View File

@@ -243,7 +243,7 @@ public class GdbCommandsTest extends AbstractGdbTraceRmiTest {
quit quit
""".formatted(PREAMBLE)); """.formatted(PREAMBLE));
assertEquals(""" assertEquals("""
Selected Ghidra language: DATA:LE:64:default Selected Ghidra language: x86:LE:32:default
Selected Ghidra compiler: pointer64""", Selected Ghidra compiler: pointer64""",
extractOutSection(out, "---Import---")); extractOutSection(out, "---Import---"));
assertEquals(""" assertEquals("""