From efd3f01041cdfa12e408f10f3d106a078af78a84 Mon Sep 17 00:00:00 2001 From: d-millar <33498836+d-millar@users.noreply.github.com> Date: Sat, 16 Sep 2023 00:29:58 +0000 Subject: [PATCH] GP-0: fixes for broken tests --- .../src/main/py/src/ghidradbg/hooks.py | 4 ++-- .../test.slow/java/agent/dbgeng/rmi/DbgEngHooksTest.java | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/hooks.py b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/hooks.py index 67ddd78230..984d86e7d9 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/hooks.py +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/hooks.py @@ -64,8 +64,8 @@ class ProcessState(object): if thread is not None: if first or thread not in self.visited: commands.putreg() - commands.putmem("$pc", "1", from_tty=False) - commands.putmem("$sp", "1", from_tty=False) + commands.putmem("$pc", "1", display_result=False) + commands.putmem("$sp", "1", display_result=False) commands.put_frames() self.visited.add(thread) frame = util.selected_frame() diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngHooksTest.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngHooksTest.java index de1af8159b..f4f20b37ec 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngHooksTest.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngHooksTest.java @@ -28,9 +28,7 @@ import java.util.Objects; import org.junit.Ignore; import org.junit.Test; -import ghidra.app.plugin.core.debug.service.rmi.trace.RemoteMethod; import ghidra.app.plugin.core.debug.utils.ManagedDomainObject; -import ghidra.dbg.testutil.DummyProc; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathPredicates; import ghidra.program.model.address.AddressSpace; @@ -39,7 +37,6 @@ import ghidra.trace.model.Lifespan; import ghidra.trace.model.Trace; import ghidra.trace.model.memory.TraceMemorySpace; import ghidra.trace.model.target.TraceObject; -import ghidra.trace.model.thread.TraceThread; import ghidra.trace.model.time.TraceSnapshot; public class DbgEngHooksTest extends AbstractDbgEngTraceRmiTest { @@ -287,12 +284,12 @@ public class DbgEngHooksTest extends AbstractDbgEngTraceRmiTest { @Test public void testOnBreakpointCreated() throws Exception { try (PythonAndTrace conn = startAndSyncPython("notepad.exe")) { + txPut(conn, "breakpoints"); assertEquals(0, tb.objValues(lastSnap(conn), "Processes[].Breakpoints[]").size()); conn.execute("dbg = util.get_debugger()"); conn.execute("pc = dbg.reg.get_pc()"); conn.execute("dbg.bp(expr=pc)"); - conn.execute("dbg.stepi()"); waitForPass(() -> { List brks = tb.objValues(lastSnap(conn), "Processes[].Breakpoints[]"); @@ -305,12 +302,12 @@ public class DbgEngHooksTest extends AbstractDbgEngTraceRmiTest { @Test public void testOnBreakpointModified() throws Exception { try (PythonAndTrace conn = startAndSyncPython("notepad.exe")) { + txPut(conn, "breakpoints"); assertEquals(0, tb.objValues(lastSnap(conn), "Processes[].Breakpoints[]").size()); conn.execute("dbg = util.get_debugger()"); conn.execute("pc = dbg.reg.get_pc()"); conn.execute("dbg.bp(expr=pc)"); - conn.execute("dbg.stepi()"); TraceObject brk = waitForPass(() -> { List brks = tb.objValues(lastSnap(conn), "Processes[].Breakpoints[]"); @@ -334,12 +331,12 @@ public class DbgEngHooksTest extends AbstractDbgEngTraceRmiTest { @Test public void testOnBreakpointDeleted() throws Exception { try (PythonAndTrace conn = startAndSyncPython("notepad.exe")) { + txPut(conn, "breakpoints"); assertEquals(0, tb.objValues(lastSnap(conn), "Processes[].Breakpoints[]").size()); conn.execute("dbg = util.get_debugger()"); conn.execute("pc = dbg.reg.get_pc()"); conn.execute("dbg.bp(expr=pc)"); - conn.execute("dbg.stepi()"); TraceObject brk = waitForPass(() -> { List brks = tb.objValues(lastSnap(conn), "Processes[].Breakpoints[]");