aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael Bien <[email protected]>2010-09-23 23:02:30 +0200
committerMichael Bien <[email protected]>2010-09-23 23:02:30 +0200
commit049de167b6b8366418eda993cde30aaa84eba6ca (patch)
tree15d40638e542358a334ca88f7475bede88d4a0b0 /test
parentd92af6dd7116883d674d1536c72bf7d62116d7dc (diff)
added junit timeouts to CLGLTest (JOGL deadlock on mac) and CLCommandQueueTest
Diffstat (limited to 'test')
-rw-r--r--test/com/jogamp/opencl/CLCommandQueueTest.java5
-rw-r--r--test/com/jogamp/opencl/gl/CLGLTest.java11
2 files changed, 16 insertions, 0 deletions
diff --git a/test/com/jogamp/opencl/CLCommandQueueTest.java b/test/com/jogamp/opencl/CLCommandQueueTest.java
index 89075c0..d25d5aa 100644
--- a/test/com/jogamp/opencl/CLCommandQueueTest.java
+++ b/test/com/jogamp/opencl/CLCommandQueueTest.java
@@ -1,5 +1,8 @@
package com.jogamp.opencl;
+import org.junit.Rule;
+import org.junit.rules.MethodRule;
+import org.junit.rules.Timeout;
import java.util.concurrent.CountDownLatch;
import com.jogamp.opencl.util.MultiQueueBarrier;
import com.jogamp.opencl.CLCommandQueue.Mode;
@@ -23,6 +26,8 @@ import static com.jogamp.common.nio.Buffers.*;
*/
public class CLCommandQueueTest {
+ @Rule
+ public MethodRule methodTimeout= new Timeout(20000);
@Test
public void enumsTest() {
diff --git a/test/com/jogamp/opencl/gl/CLGLTest.java b/test/com/jogamp/opencl/gl/CLGLTest.java
index f05c4d5..2c940aa 100644
--- a/test/com/jogamp/opencl/gl/CLGLTest.java
+++ b/test/com/jogamp/opencl/gl/CLGLTest.java
@@ -4,6 +4,9 @@
package com.jogamp.opencl.gl;
+import org.junit.Rule;
+import org.junit.rules.MethodRule;
+import org.junit.rules.Timeout;
import com.jogamp.opencl.CLDevice;
import com.jogamp.newt.Display;
import com.jogamp.newt.NewtFactory;
@@ -29,6 +32,9 @@ import static java.lang.System.*;
*/
public class CLGLTest {
+ @Rule
+ public MethodRule methodTimeout= new Timeout(5000);
+
private static GLContext glcontext;
@BeforeClass
@@ -95,6 +101,11 @@ public class CLGLTest {
try{
out.println(context);
+ /*
+ CLDevice currentDevice = context.getCurrentGLCLDevice();
+ assertNotNull(currentDevice);
+ out.println(currentDevice);
+ */
}finally{
context.release();
}