From 1a484f9149c8ac1232d6008280ee40a029bdbda4 Mon Sep 17 00:00:00 2001 From: Dan <46821332+nsadeveloper789@users.noreply.github.com> Date: Fri, 15 Jan 2021 13:47:45 -0500 Subject: [PATCH] Disabling GDB-dependent CI testing. --- .../java/agent/gdb/manager/impl/AbstractGdbManagerTest.java | 1 - .../test/java/agent/gdb/manager/impl/JoinedGdbManagerTest.java | 3 +++ .../java/agent/gdb/manager/impl/SpawnedCliGdbManagerTest.java | 3 +++ .../gdb/manager/impl/SpawnedMi2Gdb7Dot6Dot1ManagerTest.java | 3 +++ .../java/agent/gdb/manager/impl/SpawnedMi2GdbManagerTest2.java | 3 +++ .../src/test/java/agent/gdb/model/AbstractModelForGdbTest.java | 1 - .../src/test/java/agent/gdb/model/GadpForGdbTest.java | 2 ++ .../src/test/java/agent/gdb/model/ModelForGdbTest.java | 3 +++ 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/AbstractGdbManagerTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/AbstractGdbManagerTest.java index f70af4de5f..c637ac9176 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/AbstractGdbManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/AbstractGdbManagerTest.java @@ -40,7 +40,6 @@ import ghidra.test.AbstractGhidraHeadlessIntegrationTest; import ghidra.util.Msg; import ghidra.util.SystemUtilities; -@Ignore("Need correct version for CI") public abstract class AbstractGdbManagerTest extends AbstractGhidraHeadlessIntegrationTest { protected static final long TIMEOUT_MILLISECONDS = SystemUtilities.isInTestingBatchMode() ? 5000 : Long.MAX_VALUE; diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/JoinedGdbManagerTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/JoinedGdbManagerTest.java index 60cbdf4032..4d598ebef0 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/JoinedGdbManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/JoinedGdbManagerTest.java @@ -19,10 +19,13 @@ import java.io.*; import java.util.Map; import java.util.concurrent.CompletableFuture; +import org.junit.Ignore; + import agent.gdb.ffi.linux.Pty; import agent.gdb.manager.GdbManager; import ghidra.util.Msg; +@Ignore("Need compatible GDB version for CI") public class JoinedGdbManagerTest extends AbstractGdbManagerTest { protected class ReaderThread extends Thread { @Override diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedCliGdbManagerTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedCliGdbManagerTest.java index 90f59b32f0..3b4100d671 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedCliGdbManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedCliGdbManagerTest.java @@ -18,8 +18,11 @@ package agent.gdb.manager.impl; import java.io.IOException; import java.util.concurrent.CompletableFuture; +import org.junit.Ignore; + import agent.gdb.manager.GdbManager; +@Ignore("Need compatible GDB version for CI") public class SpawnedCliGdbManagerTest extends AbstractGdbManagerTest { @Override protected CompletableFuture startManager(GdbManager manager) { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2Gdb7Dot6Dot1ManagerTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2Gdb7Dot6Dot1ManagerTest.java index 7302aa5101..e6a36e3047 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2Gdb7Dot6Dot1ManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2Gdb7Dot6Dot1ManagerTest.java @@ -18,8 +18,11 @@ package agent.gdb.manager.impl; import java.io.IOException; import java.util.concurrent.CompletableFuture; +import org.junit.Ignore; + import agent.gdb.manager.GdbManager; +@Ignore("Need to install GDB 7.6.1 to the expected directory on CI") public class SpawnedMi2Gdb7Dot6Dot1ManagerTest extends AbstractGdbManagerTest { @Override protected CompletableFuture startManager(GdbManager manager) { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbManagerTest2.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbManagerTest2.java index e4f82cd30e..328d747400 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbManagerTest2.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbManagerTest2.java @@ -18,8 +18,11 @@ package agent.gdb.manager.impl; import java.io.IOException; import java.util.concurrent.CompletableFuture; +import org.junit.Ignore; + import agent.gdb.manager.GdbManager; +@Ignore("Need compatible GDB version for CI") public class SpawnedMi2GdbManagerTest2 extends AbstractGdbManagerTest { @Override protected CompletableFuture startManager(GdbManager manager) { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/AbstractModelForGdbTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/AbstractModelForGdbTest.java index fc37026371..8c0c949209 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/AbstractModelForGdbTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/AbstractModelForGdbTest.java @@ -58,7 +58,6 @@ import ghidra.program.model.address.Address; import ghidra.test.AbstractGhidraHeadlessIntegrationTest; import ghidra.util.*; -@Ignore("Need correct version for CI") public abstract class AbstractModelForGdbTest extends AbstractGhidraHeadlessIntegrationTest implements DebuggerModelTestUtils { protected static final Map AMD64_TEST_REG_VALUES = Map.of( // diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/GadpForGdbTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/GadpForGdbTest.java index dfbfb50f44..ace9ae8ba3 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/GadpForGdbTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/GadpForGdbTest.java @@ -23,6 +23,7 @@ import java.net.SocketAddress; import java.nio.channels.AsynchronousSocketChannel; import java.util.concurrent.CompletableFuture; +import org.junit.Ignore; import org.junit.Test; import agent.gdb.gadp.GdbGadpServer; @@ -35,6 +36,7 @@ import ghidra.dbg.gadp.client.GadpClientTestHelper; import ghidra.dbg.gadp.protocol.Gadp; import ghidra.util.Msg; +@Ignore("Need compatible GDB version for CI") public class GadpForGdbTest extends AbstractModelForGdbTest { class GdbGadpModelHost implements ModelHost { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ModelForGdbTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ModelForGdbTest.java index b854a2634e..f780b98f08 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ModelForGdbTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ModelForGdbTest.java @@ -17,10 +17,13 @@ package agent.gdb.model; import java.util.concurrent.CompletableFuture; +import org.junit.Ignore; + import agent.gdb.model.impl.GdbModelImpl; import ghidra.dbg.DebuggerObjectModel; import ghidra.util.Msg; +@Ignore("Need compatible GDB version for CI") public class ModelForGdbTest extends AbstractModelForGdbTest { static class GdbGadpModelHost implements ModelHost {