Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 02:36:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2023-01-30-1'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-01-30 12:51:22 -05:00
parent 316bb4403a 325f443775
commit 9014d10edf
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/DebuggerCoordinates.java
+1 -1
View File
@@ -400,7 +400,7 @@ public class DebuggerCoordinates {
* @return exactly these same coordinates with the snap/time changed * @return exactly these same coordinates with the snap/time changed
*/ */
public DebuggerCoordinates snapNoResolve(long snap) { public DebuggerCoordinates snapNoResolve(long snap) {
if (time.isSnapOnly() && time.getSnap() == snap) { if (time != null && time.isSnapOnly() && time.getSnap() == snap) {
return this; return this;
} }
TraceSchedule newTime = TraceSchedule.snap(snap); TraceSchedule newTime = TraceSchedule.snap(snap);
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/model/DebuggerModelServiceTest.java
+6 -3
View File
@@ -361,15 +361,18 @@ public class DebuggerModelServiceTest extends AbstractGhidraHeadedDebuggerGUITes
} }
@Test @Test
public void testGetTraceThreadWithTarget() throws Exception { public void testGetTraceThreadWithTarget() throws Throwable {
createTestModel(); createTestModel();
mb.createTestProcessesAndThreads(); mb.createTestProcessesAndThreads();
modelService.recordTarget(mb.testProcess1, createTargetTraceMapper(mb.testProcess1), TraceRecorder recorder =
ActionSource.AUTOMATIC); modelService.recordTarget(mb.testProcess1, createTargetTraceMapper(mb.testProcess1),
ActionSource.AUTOMATIC);
waitRecorder(recorder);
// The most complicated case, lest I want another dimension in a cross product // The most complicated case, lest I want another dimension in a cross product
mb.createTestThreadStacksAndFramesHaveRegisterBanks(); mb.createTestThreadStacksAndFramesHaveRegisterBanks();
waitRecorder(recorder);
waitForPass(() -> { waitForPass(() -> {
TraceThread traceThread = modelService.getTraceThread(mb.testProcess1, mb.testThread1); TraceThread traceThread = modelService.getTraceThread(mb.testProcess1, mb.testThread1);