From 6b28db4085cc05eb9aa3b5ff83a37c11c1f8ae2e Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Thu, 22 May 2025 16:28:29 -0400 Subject: [PATCH] Updated how the test timeout feature prints debug --- .../test/ConcurrentTestExceptionStatement.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Ghidra/Framework/Generic/src/main/java/generic/test/ConcurrentTestExceptionStatement.java b/Ghidra/Framework/Generic/src/main/java/generic/test/ConcurrentTestExceptionStatement.java index b8720a9e43..3009cdf2b1 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/test/ConcurrentTestExceptionStatement.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/test/ConcurrentTestExceptionStatement.java @@ -16,12 +16,10 @@ package generic.test; import java.util.List; -import java.util.concurrent.TimeUnit; import org.junit.runners.model.Statement; import ghidra.util.Msg; -import ghidra.util.SystemUtilities; import ghidra.util.timer.GTimer; import ghidra.util.timer.GTimerMonitor; import junit.framework.AssertionFailedError; @@ -204,10 +202,11 @@ public class ConcurrentTestExceptionStatement extends Statement { return; } - if (SystemUtilities.isInDevelopmentMode()) { - throw new AssertionFailedError("Test timeout after " + - TimeUnit.MINUTES.convert(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS) + " mins"); - } +// Not sure why we were doing this before +// if (SystemUtilities.isInDevelopmentMode()) { +// throw new AssertionFailedError("Test timeout after " + +// TimeUnit.MINUTES.convert(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS) + " mins"); +// } String vmTrace = AbstractGenericTest.createStackTraceForAllThreads(); Msg.error(ConcurrentTestExceptionStatement.class,