GP-0: Test fixes

This commit is contained in:
Dan
2024-12-30 12:37:07 -05:00
parent 1b27a76de2
commit 7e8392843f
3 changed files with 7 additions and 7 deletions

View File

@@ -118,6 +118,7 @@ data64_compiler_map = {
x86_compiler_map = {
'windows': 'windows',
'Cygwin': 'windows',
'linux' : 'gcc',
'default': 'gcc',
'unknown': 'gcc',
}

View File

@@ -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);

View File

@@ -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---"));