Skip to content

Commit 7e83928

Browse files
GP-0: Test fixes
1 parent 1b27a76 commit 7e83928

File tree

3 files changed

+7
-7
lines changed
  • Ghidra

3 files changed

+7
-7
lines changed

Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/arch.py

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
x86_compiler_map = {
119119
'windows': 'windows',
120120
'Cygwin': 'windows',
121+
'linux' : 'gcc',
121122
'default': 'gcc',
122123
'unknown': 'gcc',
123124
}

Ghidra/Framework/Pty/src/test/java/ghidra/pty/testutil/DummyProc.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,13 @@ public static String which(String cmd) {
4040
// just try next strategy
4141
}
4242

43-
List<ResourceFile> mods = Stream.concat(Application.getApplicationRootDirectories()
44-
.stream()
45-
.map(ar -> new ResourceFile(ar, "Test/DebuggerIntegrationTest")),
46-
Application.getModuleRootDirectories().stream())
47-
.toList();
48-
4943
// Try the build/exe/<cmd>/ and build/exe/<cmd>/<platform>/ directory
5044
try {
45+
List<ResourceFile> mods = Stream.concat(Application.getApplicationRootDirectories()
46+
.stream()
47+
.map(ar -> new ResourceFile(ar, "Test/DebuggerIntegrationTest")),
48+
Application.getModuleRootDirectories().stream())
49+
.toList();
5150
for (ResourceFile modRoot : mods) {
5251
ResourceFile osExe = new ResourceFile(modRoot,
5352
"build/os/" + Platform.CURRENT_PLATFORM.getDirectoryName() + "/" + cmd);

Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbCommandsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public void testLcsp() throws Exception {
252252
Selected Ghidra compiler: gcc""",
253253
extractOutSection(out, "---File---"));
254254
assertEquals("""
255-
Toy:BE:64:default not found in compiler map
255+
Toy:BE:64:default not found in compiler map - using default compiler
256256
Selected Ghidra language: Toy:BE:64:default
257257
Selected Ghidra compiler: default""",
258258
extractOutSection(out, "---Language---"));

0 commit comments

Comments
 (0)