aboutsummaryrefslogtreecommitdiffstats
path: root/test/com/jogamp/opencl/gl/CLGLTest.java
diff options
context:
space:
mode:
authorWade Walker <[email protected]>2014-02-24 19:43:43 -0600
committerWade Walker <[email protected]>2014-02-24 19:43:43 -0600
commit6ec10ee5e782da5d7ad88e93ee017925de85c37f (patch)
tree2a4de626d2e0a50607a76a96abf4cf78646a877e /test/com/jogamp/opencl/gl/CLGLTest.java
parentaf62da5b7ee3d99da7dc9364f1240fa7a8f5968e (diff)
parent54ced2cf5d801470c106275291be17583e5e206d (diff)
Merge pull request #5 from WadeWalker/bug_978_fix_solaris_tests
Fix OpenCL test failures on Solaris for bug 978.
Diffstat (limited to 'test/com/jogamp/opencl/gl/CLGLTest.java')
-rw-r--r--test/com/jogamp/opencl/gl/CLGLTest.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/com/jogamp/opencl/gl/CLGLTest.java b/test/com/jogamp/opencl/gl/CLGLTest.java
index 19bc1c99..52f0e574 100644
--- a/test/com/jogamp/opencl/gl/CLGLTest.java
+++ b/test/com/jogamp/opencl/gl/CLGLTest.java
@@ -45,6 +45,7 @@ import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.opencl.CLContext;
import com.jogamp.opencl.CLMemory.Mem;
import com.jogamp.opencl.CLPlatform;
+import com.jogamp.opencl.test.util.MiscUtils;
import com.jogamp.opencl.test.util.UITestCase;
import com.jogamp.opencl.util.CLDeviceFilters;
import com.jogamp.opencl.util.CLPlatformFilters;
@@ -106,9 +107,11 @@ public class CLGLTest extends UITestCase {
@Test(timeout=15000)
public void createContextTest() {
- initGL();
-
out.println(" - - - glcl; createContextTest - - - ");
+ if(MiscUtils.isOpenCLUnavailable())
+ return;
+
+ initGL();
CLPlatform platform = CLPlatform.getDefault(CLPlatformFilters.glSharing());
CLDevice device = platform.getMaxFlopsDevice(CLDeviceFilters.glSharing());
@@ -149,6 +152,8 @@ public class CLGLTest extends UITestCase {
public void vboSharing() {
out.println(" - - - glcl; vboSharing - - - ");
+ if(MiscUtils.isOpenCLUnavailable())
+ return;
initGL();
makeGLCurrent();