yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-5-22-25'

Browse source
This commit is contained in:
Ryan Kurtz 2025-05-23 06:10:03 -04:00
commit cd30a59a1c
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Ghidra/Framework/Generic/src/main/java/generic/test/ConcurrentTestExceptionStatement.java
View file

@ -16,12 +16,10 @@
package generic.test; package generic.test;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import org.junit.runners.model.Statement; import org.junit.runners.model.Statement;
import ghidra.util.Msg; import ghidra.util.Msg;
import ghidra.util.SystemUtilities;
import ghidra.util.timer.GTimer; import ghidra.util.timer.GTimer;
import ghidra.util.timer.GTimerMonitor; import ghidra.util.timer.GTimerMonitor;
import junit.framework.AssertionFailedError; import junit.framework.AssertionFailedError;
@ -204,10 +202,11 @@ public class ConcurrentTestExceptionStatement extends Statement {
return; return;
} }
if (SystemUtilities.isInDevelopmentMode()) { // Not sure why we were doing this before
throw new AssertionFailedError("Test timeout after " + // if (SystemUtilities.isInDevelopmentMode()) {
TimeUnit.MINUTES.convert(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS) + " mins"); // throw new AssertionFailedError("Test timeout after " +
} // TimeUnit.MINUTES.convert(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS) + " mins");
// }
String vmTrace = AbstractGenericTest.createStackTraceForAllThreads(); String vmTrace = AbstractGenericTest.createStackTraceForAllThreads();
Msg.error(ConcurrentTestExceptionStatement.class, Msg.error(ConcurrentTestExceptionStatement.class,