From d35e321e9cfc7e62186e58d0fce8cbdac4cab61b Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Tue, 25 Mar 2025 13:04:33 +0000
Subject: [PATCH] GP-0: Ensure OS check happens first.

---
 .../agent/dbgeng/rmi/AbstractDbgEngTraceRmiTest.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/AbstractDbgEngTraceRmiTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/AbstractDbgEngTraceRmiTest.java
index ae20c1709d..583158e77c 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/AbstractDbgEngTraceRmiTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/AbstractDbgEngTraceRmiTest.java
@@ -106,11 +106,6 @@ public abstract class AbstractDbgEngTraceRmiTest extends AbstractGhidraHeadedDeb
 	private Path outFile;
 	private Path errFile;
 
-	@Before
-	public void assertOS() {
-		assumeTrue(OperatingSystem.CURRENT_OPERATING_SYSTEM == OperatingSystem.WINDOWS);
-	}
-
 	@BeforeClass
 	public static void setupPython() throws Throwable {
 		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");
 	}
 
+	@BeforeClass
+	public static void assertOS() {
+		assumeTrue("Not on Windows",
+			OperatingSystem.CURRENT_OPERATING_SYSTEM == OperatingSystem.WINDOWS);
+	}
+
 	@Before
 	public void setupTraceRmi() throws Throwable {
 		traceRmi = addPlugin(tool, TraceRmiPlugin.class);