diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-newt.xml | 5 | ||||
| -rw-r--r-- | make/build-test.xml | 1 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index d728b42c7..862b78422 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -592,7 +592,7 @@ <!-- include name="${rootrel.src.c}/X11Event.c" if="isX11"/--> <!-- include name="${rootrel.src.c}/XCBEvent.c" if="isX11"/--> <include name="${rootrel.src.c}/X11Screen.c" if="isX11"/> - <include name="${rootrel.src.c}/X11ScreenRandR11.c" if="isX11"/> + <include name="${rootrel.src.c}/X11RandR11.c" if="isX11"/> <include name="${rootrel.src.c}/X11Window.c" if="isX11"/> <include name="${rootrel.src.c}/KDWindow.c" if="setup.addNativeKD"/> <include name="${rootrel.src.c}/IntelGDL.c" if="setup.addNativeIntelGDL"/> @@ -701,7 +701,8 @@ <javah destdir="${src.generated.c}/MacOSX" classpath="${javah.classpath}" class="jogamp.newt.driver.macosx.DisplayDriver" /> <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.WindowDriver" /> <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.ScreenDriver" /> - <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.ScreenRandR11" /> + <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.RandR11" /> + <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.RandR13" /> <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.DisplayDriver" /> </target> diff --git a/make/build-test.xml b/make/build-test.xml index 3d9c31d83..e00348c38 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -437,6 +437,7 @@ <fileset dir="${classes}"> <include name="${java.dir.junit}/**/newt/**/Test*AWT*"/> <!--include name="${java.dir.junit}/**/newt/**/TestNewtEventModifiers*AWT*"/--> + <!--include name="${java.dir.junit}/**/acore/glels/Test**"/--> <exclude name="**/*$$*"/> </fileset> <formatter usefile="false" type="brief"/> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 62478cdb3..65e070a99 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -115,6 +115,7 @@ function jrun() { #D_ARGS="-Djogl.debug.EGLDisplayUtil -Djogl.debug.GLDrawable" #D_ARGS="-Djogl.debug.GLDrawable -Djogl.debug.GLContext -Djogl.debug.GLCanvas" #D_ARGS="-Djogl.debug.GLDrawable" + #D_ARGS="-Djogl.debug.GLEventListenerState" #D_ARGS="-Djogl.fbo.force.none" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all -Djogamp.debug.Lock" #D_ARGS="-Djogl.debug=all" @@ -340,7 +341,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableDelegateNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableDelegateOnOffscrnCapsNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryGL2OffscrnCapsNEWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryGLnBitmapCapsNEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryGLnBitmapCapsNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryES2OffscrnCapsNEWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableGLWindowOnOffscrnCapsNEWT $* @@ -362,8 +363,9 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLAutoDrawableFactoryGLnBi #testnoawt com.jogamp.opengl.test.junit.jogl.acore.glels.TestGLContextDrawableSwitch01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.glels.TestGLContextDrawableSwitch10NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.glels.TestGLContextDrawableSwitch11NewtAWT $* -#testawt com.jogamp.opengl.test.junit.jogl.acore.glels.TestGLContextDrawableSwitch12AWT $* +testawt com.jogamp.opengl.test.junit.jogl.acore.glels.TestGLContextDrawableSwitch12AWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.glels.TestGLContextDrawableSwitch21Newt2AWT $* +#testawt com.jogamp.opengl.test.junit.jogl.acore.glels.TestBug722GLContextDrawableSwitchNewt2AWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestFBOAutoDrawableDeadlockAWT $* #testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461FBOSupersamplingSwingAWT |