mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-01-10 06:27:59 -05:00
GP-0: Test fixes
This commit is contained in:
@@ -118,6 +118,7 @@ data64_compiler_map = {
|
||||
x86_compiler_map = {
|
||||
'windows': 'windows',
|
||||
'Cygwin': 'windows',
|
||||
'linux' : 'gcc',
|
||||
'default': 'gcc',
|
||||
'unknown': 'gcc',
|
||||
}
|
||||
|
||||
@@ -40,14 +40,13 @@ public class DummyProc implements AutoCloseable {
|
||||
// just try next strategy
|
||||
}
|
||||
|
||||
List<ResourceFile> mods = Stream.concat(Application.getApplicationRootDirectories()
|
||||
.stream()
|
||||
.map(ar -> new ResourceFile(ar, "Test/DebuggerIntegrationTest")),
|
||||
Application.getModuleRootDirectories().stream())
|
||||
.toList();
|
||||
|
||||
// Try the build/exe/<cmd>/ and build/exe/<cmd>/<platform>/ directory
|
||||
try {
|
||||
List<ResourceFile> mods = Stream.concat(Application.getApplicationRootDirectories()
|
||||
.stream()
|
||||
.map(ar -> new ResourceFile(ar, "Test/DebuggerIntegrationTest")),
|
||||
Application.getModuleRootDirectories().stream())
|
||||
.toList();
|
||||
for (ResourceFile modRoot : mods) {
|
||||
ResourceFile osExe = new ResourceFile(modRoot,
|
||||
"build/os/" + Platform.CURRENT_PLATFORM.getDirectoryName() + "/" + cmd);
|
||||
|
||||
@@ -252,7 +252,7 @@ public class GdbCommandsTest extends AbstractGdbTraceRmiTest {
|
||||
Selected Ghidra compiler: gcc""",
|
||||
extractOutSection(out, "---File---"));
|
||||
assertEquals("""
|
||||
Toy:BE:64:default not found in compiler map
|
||||
Toy:BE:64:default not found in compiler map - using default compiler
|
||||
Selected Ghidra language: Toy:BE:64:default
|
||||
Selected Ghidra compiler: default""",
|
||||
extractOutSection(out, "---Language---"));
|
||||
|
||||
Reference in New Issue
Block a user