diff options
author | Sven Gothel <[email protected]> | 2015-10-03 21:55:55 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-10-03 21:55:55 +0200 |
commit | ac6c2d9492f7263a1cc15db327c63798a5b7c373 (patch) | |
tree | 47f55f905cf07fb38365284dc1507cccab0ec2c0 /src | |
parent | fe0be75545adcec2746f7e0ef53af7c75bfc8fc8 (diff) | |
parent | cd82c13fddfde8eff8cdd38dc21fa0bde3e3750a (diff) |
Merge remote-tracking branch 'xranby/master'
Diffstat (limited to 'src')
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/acore/GLProfile0XBase.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLProfile0XBase.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLProfile0XBase.java index 7fd3488ba..75d588f8e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLProfile0XBase.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLProfile0XBase.java @@ -43,6 +43,7 @@ import org.junit.FixMethodOrder; import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; +import com.jogamp.common.util.PropertyAccess; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.test.junit.util.AWTRobotUtil; @@ -915,7 +916,7 @@ public abstract class GLProfile0XBase extends UITestCase { Thread.sleep(100); // Same definition as in GLProfile for 'disableOpenGLARBContext' final boolean isOSX = Platform.OSType.MACOS == Platform.getOSType(); - final boolean disableOpenGLARBContext = null != System.getProperty("jogl.disable.openglarbcontext") && !isOSX; + final boolean disableOpenGLARBContext = PropertyAccess.isPropertyDefined("jogl.disable.openglarbcontext", true) && !isOSX; if( disableOpenGLARBContext ) { Assert.assertFalse("Property 'jogl.disable.openglarbcontext' set, but created w/ ARB", glad.getContext().isCreatedWithARBMethod()); |