diff options
| author | Sven Gothel <[email protected]> | 2010-09-26 02:52:24 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-09-26 02:52:24 +0200 |
| commit | d73b4eb2a76941a932ac70829579282c64f305fe (patch) | |
| tree | 09c6eb945702b4b44f9d7ad313ed32f420f8185d | |
| parent | 8a850ea69d90fa68efecb52ba8dc6ec3938505d7 (diff) | |
RecursiveToolkitLock default TO 5s
| -rwxr-xr-x | make/scripts/tests.sh | 6 | ||||
| -rw-r--r-- | src/nativewindow/classes/com/jogamp/nativewindow/impl/RecursiveToolkitLock.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 6aea63c3a..cf063b767 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -19,12 +19,12 @@ spath=`dirname $0` # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01NEWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02NEWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01aAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cAWT $* +$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01aAWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01bAWT $* +# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cAWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cSwingAWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02AWT $* -$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.awt.TestSwingAWTUsageBeforeJOGLInitBug411 $* +# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.awt.TestSwingAWTUsageBeforeJOGLInitBug411 $* $spath/count-edt-start.sh java-run.log diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/impl/RecursiveToolkitLock.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/RecursiveToolkitLock.java index 3e571b0ef..a894c616a 100644 --- a/src/nativewindow/classes/com/jogamp/nativewindow/impl/RecursiveToolkitLock.java +++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/RecursiveToolkitLock.java @@ -37,7 +37,7 @@ public class RecursiveToolkitLock { private Thread owner = null; private int recursionCount = 0; private Exception lockedStack = null; - private static final long timeout = 3000; // maximum wait 3s + private static final long timeout = 5000; // maximum wait 5s // private static final long timeout = 300000; // maximum wait 300s private static final boolean TRACE_LOCK = Debug.debug("TraceLock"); |