yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

GP-0: Fix DummyProc (DebuggerTests)

Browse source
This commit is contained in:
Dan 2024-12-19 10:42:00 -05:00
parent 8bb8886deb
commit 6f79a6f1db
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import java.io.*;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Stream;
import generic.jar.ResourceFile;
import ghidra.framework.Application;
@ -39,9 +40,20 @@ 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 {
for (ResourceFile modRoot : Application.getModuleRootDirectories()) {
for (ResourceFile modRoot : mods) {
ResourceFile osExe = new ResourceFile(modRoot,
"build/os/" + Platform.CURRENT_PLATFORM.getDirectoryName() + "/" + cmd);
if (osExe.exists() && osExe.getFile(false).canExecute()) {
return osExe.getAbsolutePath();
}
ResourceFile exe = new ResourceFile(modRoot, "build/exe/" + cmd + "/" + cmd);
if (exe.exists() && exe.getFile(false).canExecute()) {
return exe.getAbsolutePath();
@ -53,8 +65,8 @@ public class DummyProc implements AutoCloseable {
return platformExe.getAbsolutePath();
}
platformExe = new ResourceFile(modRoot,
"build/exe/" + cmd + "/" + Platform.CURRENT_PLATFORM.getDirectoryName() + "/" +
cmd + ".exe");
"build/exe/" + cmd + "/" + Platform.CURRENT_PLATFORM.getDirectoryName() + "/" +
cmd + ".exe");
if (platformExe.exists() && platformExe.getFile(false).canExecute()) {
return platformExe.getAbsolutePath();
}