GP-6380: tests may fail w/ 21, but for now keep them working

GP-6380: minor mod
GP-6380: oops
GP-6380: fixes + exit code 0 for timeouts
GP-6380: lldb-21 changes
This commit is contained in:
d-millar
2026-02-17 11:20:11 -05:00
parent 0ee235fba7
commit ea521b6fa7
5 changed files with 11 additions and 2 deletions
@@ -86,7 +86,9 @@ function Add-Lldb-Extra-Cmds {
function Add-Lldb-Tail-Args {
param([ref]$ArgList)
# NOP
$ArgList.Value+=("-o", "`"ghidra trace sync-enable`"")
$ArgList.Value+=("-o", "`"ghidra trace sync-synth-stopped`"")
}
function Compute-Lldb-Usermode-Args {
@@ -82,6 +82,8 @@ add-lldb-extra-cmds() {
}
add-lldb-tail-args() {
args+=(-o "ghidra trace sync-enable")
args+=(-o "ghidra trace sync-synth-stopped")
true
}
@@ -255,7 +255,7 @@ public abstract class AbstractLldbTraceRmiTest extends AbstractGhidraHeadedDebug
return new LldbResult(false, exitVal, capture.toString());
}
catch (TimeoutException e) {
return new LldbResult(true, -1, capture.toString());
return new LldbResult(true, 0, capture.toString());
}
catch (Exception e) {
return ExceptionUtils.rethrow(e);
@@ -444,6 +444,8 @@ public class LldbHooksTest extends AbstractLldbTraceRmiTest {
conn.execute("file " + obj);
conn.execute("ghidra trace sync-enable");
conn.execute("process launch --stop-at-entry");
conn.execute("ghidra trace sync-enable");
conn.execute("ghidra trace sync-synth-stopped");
txPut(conn, "processes");
}
@@ -28,6 +28,7 @@ import org.junit.experimental.categories.Category;
import generic.Unique;
import generic.test.category.NightlyCategory;
import generic.test.rule.Repeated;
import ghidra.app.plugin.core.debug.utils.ManagedDomainObject;
import ghidra.debug.api.tracermi.RemoteMethod;
import ghidra.framework.OperatingSystem;
@@ -1173,6 +1174,8 @@ public class LldbMethodsTest extends AbstractLldbTraceRmiTest {
conn.execute("file " + obj);
conn.execute("ghidra trace start");
conn.execute("process launch --stop-at-entry");
conn.execute("ghidra trace sync-enable");
conn.execute("ghidra trace sync-synth-stopped");
}
private void txPut(LldbAndConnection conn, String obj) {