mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-09-28 17:11:11 -09:00
Merge remote-tracking branch 'origin/patch'
This commit is contained in:
@@ -16,7 +16,8 @@
|
||||
package agent.lldb.rmi;
|
||||
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
import static org.hamcrest.Matchers.*;
|
||||
import static org.hamcrest.Matchers.greaterThan;
|
||||
import static org.hamcrest.Matchers.instanceOf;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
@@ -316,9 +317,9 @@ public class LldbHooksTest extends AbstractLldbTraceRmiTest {
|
||||
try (LldbAndTrace conn = startAndSyncLldb()) {
|
||||
start(conn, getSpecimenPrint());
|
||||
|
||||
TraceObject inf = waitForValue(() -> tb.objAny0("Processes[]"));
|
||||
TraceObject proc = waitForValue(() -> tb.objAny0("Processes[]"));
|
||||
waitForPass(() -> {
|
||||
assertEquals("STOPPED", tb.objValue(inf, lastSnap(conn), "_state"));
|
||||
assertEquals("STOPPED", tb.objValue(proc, lastSnap(conn), "_state"));
|
||||
}, RUN_TIMEOUT_MS, RETRY_MS);
|
||||
conn.success();
|
||||
}
|
||||
@@ -412,11 +413,11 @@ public class LldbHooksTest extends AbstractLldbTraceRmiTest {
|
||||
|
||||
waitStopped(conn.conn);
|
||||
conn.execute("breakpoint delete %s".formatted(brk.getCanonicalPath().index()));
|
||||
conn.execute("stepi");
|
||||
waitForPass(noExc(() -> conn.execute("stepi")));
|
||||
|
||||
waitForPass(
|
||||
() -> assertEquals(0,
|
||||
tb.objValues(lastSnap(conn), "Processes[].Breakpoints[]").size()));
|
||||
waitForPass(() -> {
|
||||
assertEquals(0, tb.objValues(lastSnap(conn), "Processes[].Breakpoints[]").size());
|
||||
});
|
||||
conn.success();
|
||||
}
|
||||
}
|
||||
@@ -438,8 +439,7 @@ public class LldbHooksTest extends AbstractLldbTraceRmiTest {
|
||||
conn.success();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void start(LldbAndTrace conn, String obj) {
|
||||
conn.execute("file " + obj);
|
||||
conn.execute("ghidra trace sync-enable");
|
||||
|
||||
Reference in New Issue
Block a user