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

Merge remote-tracking branch

Browse Source 
'origin/GP-1678_Dan_objectRecorder--SQUASHED'

Conflicts:
	Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/copying/DebuggerCopyIntoProgramDialog.java
This commit is contained in:
Ryan Kurtz
2022-04-29 10:10:33 -04:00
parent 576c02c369 032ae36005
commit 0e8e418bfa
110 changed files with 3191 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/AbstractModelForGdbFrameActivationTest.java
+1 -1
View File
@@ -83,6 +83,6 @@ public abstract class AbstractModelForGdbFrameActivationTest
assertFalse(line.contains("\n"));
assertTrue(line.startsWith("#"));
String frameLevel = line.substring(1).split("\\s+")[0];
assertEquals(expected.getPath(), STACK_PATTERN.applyIndices(frameLevel).getSingletonPath());
assertEquals(expected.getPath(), STACK_PATTERN.applyKeys(frameLevel).getSingletonPath());
}
}
Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/AbstractModelForGdbInferiorActivationTest.java
+1 -1
View File
@@ -74,6 +74,6 @@ public abstract class AbstractModelForGdbInferiorActivationTest
.filter(l -> l.trim().startsWith("*"))
.collect(Collectors.toList())).trim();
String inferiorId = line.split("\\s+")[1];
assertEquals(expected.getPath(), INF_PATTERN.applyIndices(inferiorId).getSingletonPath());
assertEquals(expected.getPath(), INF_PATTERN.applyKeys(inferiorId).getSingletonPath());
}
}
Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/AbstractModelForGdbThreadActivationTest.java
+1 -1
View File
@@ -87,6 +87,6 @@ public abstract class AbstractModelForGdbThreadActivationTest
.collect(Collectors.toList()));
String threadGid = line.split("\\s+")[2];
assertEquals(expected.getPath(),
THREAD_PATTERN.applyIndices(threadGid, threadGid).getSingletonPath());
THREAD_PATTERN.applyKeys(threadGid, threadGid).getSingletonPath());
}
}