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

Merge remote-tracking branch 'origin/GT-0-dragonmacher-test-fixes'

Browse source
This commit is contained in:
ghidravore 2020-01-29 18:55:47 -05:00
commit ccd5030574
12 changed files with 196 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,17 +60,21 @@ public class ConcurrentTestExceptionStatement extends Statement {
}
private long getTestTimeout() {
String timeoutString =
System.getProperty(TEST_TIMEOUT_MILLIS_PROPERTY, Long.toString(TIMEOUT_MILLIS));
String timeoutOverrideString =
System.getProperty(TEST_TIMEOUT_MILLIS_PROPERTY, null);
if (timeoutOverrideString == null) {
return TIMEOUT_MILLIS;
}
try {
long timeout = Long.parseLong(timeoutString);
long timeout = Long.parseLong(timeoutOverrideString);
Msg.info(this, "Using test timeout override value " + timeout + "ms");
return timeout;
}
catch (NumberFormatException e) {
Msg.error(this,
"Unable to parse " + TEST_TIMEOUT_MILLIS_PROPERTY + " Long value '" +
timeoutString + "'");
timeoutOverrideString + "'");
}
return TIMEOUT_MILLIS;
}