github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 22:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2025-03-25-1'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-03-25 09:15:47 -04:00
parent 5d50b6236a 422372a69e
commit 397a814f5f
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/TraceRmiPythonClientTest.java
View File

@@ -106,7 +106,12 @@ public class TraceRmiPythonClientTest extends AbstractGhidraHeadedDebuggerTest {
} }
protected Path getPathToPython() { protected Path getPathToPython() {
return Paths.get(DummyProc.which("python")); try {
return Paths.get(DummyProc.which("python3"));
}
catch (RuntimeException e) {
return Paths.get(DummyProc.which("python"));
}
} }
@Before @Before
@@ -169,8 +174,7 @@ public class TraceRmiPythonClientTest extends AbstractGhidraHeadedDebuggerTest {
} }
protected record ExecInPy(PtySession session, PrintWriter stdin, protected record ExecInPy(PtySession session, PrintWriter stdin,
CompletableFuture<PyResult> future) { CompletableFuture<PyResult> future) {}
}
@SuppressWarnings("resource") // Do not close stdin @SuppressWarnings("resource") // Do not close stdin
protected ExecInPy execInPy(String script) throws IOException { protected ExecInPy execInPy(String script) throws IOException {

11
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/AbstractDbgEngTraceRmiTest.java
View File

@@ -106,11 +106,6 @@ public abstract class AbstractDbgEngTraceRmiTest extends AbstractGhidraHeadedDeb
private Path outFile; private Path outFile;
private Path errFile; private Path errFile;
@Before
public void assertOS() {
assumeTrue(OperatingSystem.CURRENT_OPERATING_SYSTEM == OperatingSystem.WINDOWS);
}
@BeforeClass @BeforeClass
public static void setupPython() throws Throwable { public static void setupPython() throws Throwable {
if (didSetupPython) { if (didSetupPython) {
@@ -145,6 +140,12 @@ public abstract class AbstractDbgEngTraceRmiTest extends AbstractGhidraHeadedDeb
pb.environment().put("WINDBG_DIR", "C:\\Program Files\\Amazon Corretto\\jdk21.0.3_9\\bin"); pb.environment().put("WINDBG_DIR", "C:\\Program Files\\Amazon Corretto\\jdk21.0.3_9\\bin");
} }
@BeforeClass
public static void assertOS() {
assumeTrue("Not on Windows",
OperatingSystem.CURRENT_OPERATING_SYSTEM == OperatingSystem.WINDOWS);
}
@Before @Before
public void setupTraceRmi() throws Throwable { public void setupTraceRmi() throws Throwable {
traceRmi = addPlugin(tool, TraceRmiPlugin.class); traceRmi = addPlugin(tool, TraceRmiPlugin.class);