diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/scripts/eglestest-java-linux.sh | 20 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 7 |
2 files changed, 16 insertions, 11 deletions
diff --git a/make/scripts/eglestest-java-linux.sh b/make/scripts/eglestest-java-linux.sh index 52b364c12..6eadd2fd8 100644 --- a/make/scripts/eglestest-java-linux.sh +++ b/make/scripts/eglestest-java-linux.sh @@ -4,8 +4,8 @@ export ANT_PATH=/opt-share/apache-ant #TSTCLASS=com.jogamp.nativewindow.NativeWindowVersion #TSTCLASS=com.jogamp.opengl.JoglVersion #TSTCLASS=com.jogamp.newt.NewtVersion -TSTCLASS=com.jogamp.newt.opengl.GLWindow -#TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT $* +#TSTCLASS=com.jogamp.newt.opengl.GLWindow +TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT #TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState01NEWT @@ -20,18 +20,20 @@ LOGFILE=`basename $0 .sh`.log CP_BASE=../../gluegen/make/lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:../../gluegen/make/$BUILD_DIR/gluegen.jar CP_JOGL_ALL=$BUILD_DIR/jar/nativewindow.all.jar:$BUILD_DIR/jar/jogl.all.jar:$BUILD_DIR/jar/newt.all.jar:$BUILD_DIR/jar/jogl.test.jar #CP_JOGL_EGLES=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles1.jar:$BUILD_DIR/jar/jogl.gles1.dbg.jar:$BUILD_DIR/jar/jogl.gles2.jar:$BUILD_DIR/jar/jogl.gles2.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar -CP_JOGL_EGLES=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles2.jar:$BUILD_DIR/jar/jogl.gles2.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar +CP_JOGL_EGLES1=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles1.jar:$BUILD_DIR/jar/jogl.gles1.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar +CP_JOGL_EGLES2=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles2.jar:$BUILD_DIR/jar/jogl.gles2.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar + +LD_OGLES1=/opt-share/egles-emu/PVRVFrame/OGLES-1.1/Linux_x86_64 +LD_OGLES2=/opt-share/egles-emu/PVRVFrame/OGLES-2.0/Linux_x86_64 export DISPLAY=:0.0 ; -LD_LIBRARY_PATH=/opt-share/egles-emu/PVRVFrame/OGLES-2.0/Linux_x86_64:../../gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/lib \ +LD_LIBRARY_PATH=$LD_OGLES1:../../gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/lib \ java \ -Djava.library.path=../../gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/lib \ - -Djava.class.path=$CP_BASE:$CP_JOGL_EGLES \ - -Djogl.debug.GLProfile=true \ - -Djogl.debug.EGL=true \ + -Djava.class.path=$CP_BASE:$CP_JOGL_EGLES1 \ -Djogl.debug=all \ - -Djogamp.debug.JNILibLoader=true \ - -Djogamp.debug.NativeLibrary=true \ + -Dnewt.debug=all \ + -Dnativewindow.debug=all \ $TSTCLASS \ 2>&1 | tee $LOGFILE \ diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 62880dd56..e10044f47 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -56,6 +56,8 @@ function jrun() { #D_ARGS="-Dnewt.debug.EDT" # D_ARGS="-Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.X11Util.TraceDisplayLifecycle=true" D_ARGS="-Dnativewindow.x11.mt-bug=true" + #D_ARGS="-Dnativewindow.x11.mt-bug=true -Djogl.debug.DebugGL" + #D_ARGS="-Dnativewindow.x11.mt-bug=true -Djogl.debug=all" #D_ARGS="-Dnativewindow.x11.mt-bug=true -Dnativewindow.debug.NativeWindow -Dnativewindow.debug.X11Util -Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.X11Util.TraceDisplayLifecycle=true" #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=1000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" @@ -102,7 +104,7 @@ function jrun() { echo $javaexe $X_ARGS $D_ARGS $C_ARG $* #LD_LIBRARY_PATH=/usr/local/projects/Xorg.modular/build-x86_64/lib:$LD_LIBRARY_PATH \ #LD_LIBRARY_PATH=/opt-linux-x86_64/x11lib-1.3:$LD_LIBRARY_PATH \ - LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64:$LD_LIBRARY_PATH \ + #LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64:$LD_LIBRARY_PATH \ $javaexe $X_ARGS $D_ARGS $C_ARG $* echo echo "Test End: $*" @@ -128,7 +130,7 @@ function testawtmt() { #testnoawt com.jogamp.nativewindow.NativeWindowVersion $* #testnoawt com.jogamp.opengl.JoglVersion $* #testnoawt com.jogamp.newt.NewtVersion $* -testnoawt com.jogamp.newt.opengl.GLWindow $* +#testnoawt com.jogamp.newt.opengl.GLWindow $* #testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $* @@ -140,6 +142,7 @@ testnoawt com.jogamp.newt.opengl.GLWindow $* #testnoawt com.jogamp.opengl.test.junit.newt.TestRemoteGLWindows01NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated $* #testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle01NEWT #testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT |