Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-25 16:19:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_d-millar_WS22_test_failures'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-02-04 13:23:03 -05:00
parent 07898ffaab 56754157b0
commit 70e4c03445
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngCommandsTest.java
+2 -4
View File
@@ -989,11 +989,9 @@ public class DbgEngCommandsTest extends AbstractDbgEngTraceRmiTest {
Address bp1 = rangeMain.getMinAddress();
assertBreakLoc(procBreakLocVals.get(0), "[0]", bp1, 1,
Set.of(TraceBreakpointKind.SW_EXECUTE),
"ntdll!LdrInit");
Set.of(TraceBreakpointKind.SW_EXECUTE), "ntdll!Ldr");
assertBreakLoc(procBreakLocVals.get(1), "[1]", bp1.add(4), 1,
Set.of(TraceBreakpointKind.HW_EXECUTE),
"ntdll!LdrInit");
Set.of(TraceBreakpointKind.HW_EXECUTE), "ntdll!Ldr");
}
}
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngMethodsTest.java
+3 -6
View File
@@ -15,8 +15,7 @@
*/
package agent.dbgeng.rmi;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import java.io.File;
@@ -143,11 +142,9 @@ public class DbgEngMethodsTest extends AbstractDbgEngTraceRmiTest {
Address main = rangeMain.getMinAddress();
assertBreakLoc(procBreakLocVals.get(0), "[0]", main, 1,
Set.of(TraceBreakpointKind.SW_EXECUTE),
"ntdll!LdrInit");
Set.of(TraceBreakpointKind.SW_EXECUTE), "ntdll!Ldr");
assertBreakLoc(procBreakLocVals.get(1), "[1]", main.add(4), 1,
Set.of(TraceBreakpointKind.HW_EXECUTE),
"ntdll!LdrInit");
Set.of(TraceBreakpointKind.HW_EXECUTE), "ntdll!Ldr");
}
}
}
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/AbstractGdbTraceRmiTest.java
+1 -1
View File
@@ -610,7 +610,7 @@ public abstract class AbstractGdbTraceRmiTest extends AbstractGhidraHeadedDebugg
// The targets above use different sleep methods:
// Linux spawns clock_nanosleep
// Windows spawns ZwDelayExecution and multiple ZwWaitForWork threads
return IS_WINDOWS ? 3 : 1;
return IS_WINDOWS ? 2 : 1;
}
}
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/AbstractLldbTraceRmiTest.java
+1 -1
View File
@@ -93,7 +93,7 @@ public abstract class AbstractLldbTraceRmiTest extends AbstractGhidraHeadedDebug
// The targets above use different sleep methods:
// Linux spawns clock_nanosleep
// Windows spawns ZwDelayExecution and multiple ZwWaitForWork threads
return IS_WINDOWS ? 3 : 1;
return IS_WINDOWS ? 2 : 1;
}
static String getSpecimenPrint() {