File tree 3 files changed +7
-7
lines changed
Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb
Framework/Pty/src/test/java/ghidra/pty/testutil
Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi
3 files changed +7
-7
lines changed Original file line number Diff line number Diff line change 118
118
x86_compiler_map = {
119
119
'windows' : 'windows' ,
120
120
'Cygwin' : 'windows' ,
121
+ 'linux' : 'gcc' ,
121
122
'default' : 'gcc' ,
122
123
'unknown' : 'gcc' ,
123
124
}
Original file line number Diff line number Diff line change @@ -40,14 +40,13 @@ public static String which(String cmd) {
40
40
// just try next strategy
41
41
}
42
42
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
-
49
43
// Try the build/exe/<cmd>/ and build/exe/<cmd>/<platform>/ directory
50
44
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 ();
51
50
for (ResourceFile modRoot : mods ) {
52
51
ResourceFile osExe = new ResourceFile (modRoot ,
53
52
"build/os/" + Platform .CURRENT_PLATFORM .getDirectoryName () + "/" + cmd );
Original file line number Diff line number Diff line change @@ -252,7 +252,7 @@ public void testLcsp() throws Exception {
252
252
Selected Ghidra compiler: gcc""" ,
253
253
extractOutSection (out , "---File---" ));
254
254
assertEquals ("""
255
- Toy:BE:64:default not found in compiler map
255
+ Toy:BE:64:default not found in compiler map - using default compiler
256
256
Selected Ghidra language: Toy:BE:64:default
257
257
Selected Ghidra compiler: default""" ,
258
258
extractOutSection (out , "---Language---" ));
You can’t perform that action at this time.
0 commit comments