development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-08-27 21:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests - increased merge tests timeout to avoid timeouts in parallel mode

Browse source
This commit is contained in:
dragonmacher 2019-06-06 16:02:34 -04:00
parent 0e83fdbe70
commit 458b02e65d
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/AbstractMergeTest.java
View file

@ -15,8 +15,7 @@
*/
package ghidra.app.merge;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import static org.junit.Assert.*;
import java.awt.*;
import java.util.ArrayList;
@ -41,7 +40,7 @@ import ghidra.util.Msg;
public abstract class AbstractMergeTest extends AbstractGhidraHeadedIntegrationTest {
// TODO this may need to be modified for parallel mode
protected static final int MAX_MERGE_TIMEOUT = 10000;
protected static final int MAX_MERGE_TIMEOUT = 20000;
protected MergeTestFacilitator mtf;
protected Program originalProgram;