Skip to content

Commit 1094be1

Browse files
GP-0: Fix tests.
1 parent 66ace1a commit 1094be1

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/AbstractTraceRmiListener.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
7-
*
7+
*
88
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
9+
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -80,6 +80,10 @@ public void close() {
8080
}
8181

8282
public SocketAddress getAddress() {
83+
ServerSocket socket = this.socket;
84+
if (socket == null) {
85+
return null;
86+
}
8387
return socket.getLocalSocketAddress();
8488
}
8589
}

Ghidra/Debug/Debugger-rmi-trace/src/test/java/ghidra/app/plugin/core/debug/gui/tracermi/connection/TraceRmiConnectionManagerProviderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import ghidra.debug.api.tracermi.TraceRmiAcceptor;
4444
import ghidra.debug.api.tracermi.TraceRmiConnection;
4545
import ghidra.trace.model.target.schema.SchemaContext;
46-
import ghidra.trace.model.target.schema.XmlSchemaContext;
4746
import ghidra.trace.model.target.schema.TraceObjectSchema.SchemaName;
47+
import ghidra.trace.model.target.schema.XmlSchemaContext;
4848
import ghidra.util.exception.CancelledException;
4949

5050
public class TraceRmiConnectionManagerProviderTest extends AbstractGhidraHeadedDebuggerTest {

Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/lldb/rmi/LldbCommandsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ script print("---Compiler---")
244244
Selected Ghidra compiler: %s""".formatted(PLAT.lang(), PLAT.cSpec()),
245245
extractOutSection(out, "---File---"));
246246
assertEquals("""
247-
Toy:BE:64:default not found in compiler map
247+
Toy:BE:64:default not found in compiler map - using default compiler
248248
Selected Ghidra language: Toy:BE:64:default
249249
Selected Ghidra compiler: default""",
250250
extractOutSection(out, "---Language---"));

0 commit comments

Comments
 (0)