mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ghidra1
2024-01-30 14:39:10 -05:00
parent 70ffd4d75e 5101e95326
commit 3130bc1076
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
View File

@@ -1206,6 +1206,9 @@ public class DebuggerListingProvider extends CodeViewerProvider {
AddressSet set = new AddressSet(space.getMinAddress(), space.getMaxAddress()); AddressSet set = new AddressSet(space.getMinAddress(), space.getMaxAddress());
Reqs reqs = Reqs.fromView(tool, view); Reqs reqs = Reqs.fromView(tool, view);
if (reqs == null) {
return;
}
CurrentPlatformTraceDisassembleCommand dis = CurrentPlatformTraceDisassembleCommand dis =
new CurrentPlatformTraceDisassembleCommand(tool, set, reqs, start); new CurrentPlatformTraceDisassembleCommand(tool, set, reqs, start);
dis.run(tool, view); dis.run(tool, view);

6
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelProviderTest.java
View File

@@ -411,7 +411,9 @@ public class DebuggerModelProviderTest extends AbstractGhidraHeadedDebuggerTest
GTree tree = modelProvider.objectsTreePanel.tree; GTree tree = modelProvider.objectsTreePanel.tree;
GTreeNode node = waitForPass(() -> { GTreeNode node = waitForPass(() -> {
GTreeNode n = Unique.assertOne(tree.getSelectedNodes()); GTreeNode n = Unique.assertOne(tree.getSelectedNodes());
assertEquals("Processes@0", n.getName()); assertEquals(
"Processes@%d".formatted(System.identityHashCode(processes.getCanonicalParent(0))),
n.getName());
return n; return n;
}); });
clickTreeNode(tree, node, MouseEvent.BUTTON1); clickTreeNode(tree, node, MouseEvent.BUTTON1);
@@ -822,7 +824,7 @@ public class DebuggerModelProviderTest extends AbstractGhidraHeadedDebuggerTest
} }
waitForTasks(); waitForTasks();
waitForPass(() -> assertEquals("<html>Renamed Thread", node.getDisplayText())); waitForPass(() -> assertEquals("<html>Renamed&nbsp;Thread", node.getDisplayText()));
} }
@Test @Test