Unit Tests: Increase minimum manual set timeout to 10s

6 files changed, 13 insertions, 15 deletions

diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 0d8fe8d4f..c0bfcc573 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -88,7 +88,7 @@ function jrun() {
     swton=$1
     shift
 
-    D_ARGS="-Djogl.debug.DebugGL"
+    #D_ARGS="-Djogl.debug.DebugGL"
     #D_ARGS="-Djogl.debug.TraceGL"
     #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL"
     #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
@@ -196,6 +196,7 @@ function jrun() {
     #D_ARGS="-Dnativewindow.debug.X11Util.XSync -Dnewt.debug.Window"
     #D_ARGS="-Djogl.debug.GLDrawable -Djogl.debug.GLContext"
     #D_ARGS="-Dnativewindow.debug.NativeWindow -Dnativewindow.debug.X11Util"
+    #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=3000 -Djogamp.debug.Lock"
     #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=3000 -Djogamp.debug.Lock -Djogl.debug.GLContext.TraceSwitch"
     #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=3000 -Djogamp.debug.Lock -Dnativewindow.debug.ToolkitLock.TraceLock"
     #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock -Dnativewindow.debug.ToolkitLock.TraceLock"
@@ -503,11 +504,8 @@ function testawtswt() {
 #testawt   com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2AWT3 $*
 #testawt   com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2AWT3b $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT0 $*
-testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT1 $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT1 $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT2 $*
-
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
-
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT3 $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT4 $*
 #testswt   com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2SWT3 $*
@@ -731,7 +729,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT1 $
 #testawt com.jogamp.opengl.test.junit.newt.TestListenerCom01AWT
 #testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES1AWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES1NEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES2NEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES2NEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestTranslucentChildWindowBug632NEWT $*
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext01NEWT.java
index c17f669ee..05f70689c 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext01NEWT.java
@@ -58,12 +58,12 @@ import com.jogamp.opengl.util.Animator;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestBug669RecursiveGLContext01NEWT extends UITestCase {
 
-  @Test(timeout=5000)
+  @Test(timeout=10000)
   public void test01_Plain() {
       test01Impl(false);
   }
 
-  @Test(timeout=5000)
+  @Test(timeout=10000)
   public void test01_Anim() {
       test01Impl(true);
   }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext02NEWT.java
index 54afe9143..4a8499be2 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext02NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext02NEWT.java
@@ -56,12 +56,12 @@ import com.jogamp.opengl.util.Animator;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestBug669RecursiveGLContext02NEWT extends UITestCase {
 
-  @Test(timeout=5000)
+  @Test(timeout=10000)
   public void test01_Plain() {
       test01Impl(false);
   }
 
-  @Test(timeout=5000)
+  @Test(timeout=10000)
   public void test01_Anim() {
       test01Impl(true);
   }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java
index 2559fe363..929799ecd 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java
@@ -102,7 +102,7 @@ public class TestFBOAutoDrawableDeadlockAWT extends UITestCase {
     fbod.destroy();
   }
 
-  @Test(timeout = 2000) // 2s timeout
+  @Test(timeout = 10000)
   public void testDeadlock() throws InterruptedException, InvocationTargetException {
     final GLCapabilities caps = new GLCapabilities( glp );
     runTestGL( caps );
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java
index ec377662f..e8b21e935 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java
@@ -101,7 +101,7 @@ public class TestPBufferDeadlockAWT extends UITestCase {
     pbuffer.destroy();
   }
 
-  @Test(timeout = 2000) // 2s timeout
+  @Test(timeout = 10000)
   public void testDeadlock() throws InterruptedException, InvocationTargetException {
     final GLCapabilities caps = new GLCapabilities( glp );
     runTestGL( caps );
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java
index daac8ad5a..148e107e3 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java
@@ -87,17 +87,17 @@ public class TestMultisampleES2NEWT extends UITestCase {
     testMultiSampleAAImpl(false, true, 0);
   }
 
-  @Test(timeout = 3000) // 3s timeout
+  @Test(timeout = 10000)
   public void testOffsreenPBufferMultiSampleAA8() throws InterruptedException {
     testMultiSampleAAImpl(false, true, 8);
   }
 
-  @Test(timeout = 3000) // 3s timeout
+  @Test(timeout = 10000)
   public void testOffscreenFBOMultiSampleAA0() throws InterruptedException {
     testMultiSampleAAImpl(true, false, 0);
   }
 
-  @Test(timeout = 3000) // 3s timeout
+  @Test(timeout = 10000)
   public void testOffsreenFBOMultiSampleAA8() throws InterruptedException {
     testMultiSampleAAImpl(true, false, 8);
   }