Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 06:25:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-0: Fix tests.

Browse Source
This commit is contained in:
Dan
2025-01-02 14:07:32 -05:00
parent 66ace1a8a8
commit 1094be1463
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/AbstractTraceRmiListener.java
+6 -2
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -80,6 +80,10 @@ public abstract class AbstractTraceRmiListener {
} }
public SocketAddress getAddress() { public SocketAddress getAddress() {
ServerSocket socket = this.socket;
if (socket == null) {
return null;
}
return socket.getLocalSocketAddress(); return socket.getLocalSocketAddress();
} }
} }
Ghidra/Debug/Debugger-rmi-trace/src/test/java/ghidra/app/plugin/core/debug/gui/tracermi/connection/TraceRmiConnectionManagerProviderTest.java
+1 -1
View File
@@ -43,8 +43,8 @@ import ghidra.debug.api.target.Target;
import ghidra.debug.api.tracermi.TraceRmiAcceptor; import ghidra.debug.api.tracermi.TraceRmiAcceptor;
import ghidra.debug.api.tracermi.TraceRmiConnection; import ghidra.debug.api.tracermi.TraceRmiConnection;
import ghidra.trace.model.target.schema.SchemaContext; import ghidra.trace.model.target.schema.SchemaContext;
import ghidra.trace.model.target.schema.XmlSchemaContext;
import ghidra.trace.model.target.schema.TraceObjectSchema.SchemaName; import ghidra.trace.model.target.schema.TraceObjectSchema.SchemaName;
import ghidra.trace.model.target.schema.XmlSchemaContext;
import ghidra.util.exception.CancelledException; import ghidra.util.exception.CancelledException;
public class TraceRmiConnectionManagerProviderTest extends AbstractGhidraHeadedDebuggerTest { public class TraceRmiConnectionManagerProviderTest extends AbstractGhidraHeadedDebuggerTest {
Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbCommandsTest.java
+1 -1
View File
@@ -244,7 +244,7 @@ public class LldbCommandsTest extends AbstractLldbTraceRmiTest {
Selected Ghidra compiler: %s""".formatted(PLAT.lang(), PLAT.cSpec()), Selected Ghidra compiler: %s""".formatted(PLAT.lang(), PLAT.cSpec()),
extractOutSection(out, "---File---")); extractOutSection(out, "---File---"));
assertEquals(""" 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 language: Toy:BE:64:default
Selected Ghidra compiler: default""", Selected Ghidra compiler: default""",
extractOutSection(out, "---Language---")); extractOutSection(out, "---Language---"));