Skip to content

Ghidra is a software reverse engineering (SRE) framework

Updated how the test timeout feature prints debug

dragonmacher6b28db4085cc
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,