diff options
| -rwxr-xr-x | make/scripts/tests-win.bat | 51 | ||||
| -rwxr-xr-x | make/scripts/tests-x64-dbg.bat | 6 | ||||
| -rwxr-xr-x | make/scripts/tests-x64.bat | 2 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 4 |
4 files changed, 43 insertions, 20 deletions
diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index 7b2c84102..4716d98f6 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -21,9 +21,14 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLa REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.gl3.newt.TestGeomShader01TextureGL3NEWT %* -REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple %* -REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube %* -REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.TexCubeES2 %* +REM +REM av demos +REM +REM scripts\java-win.bat jogamp.opengl.openal.av.ALDummyUsage %* +REM scripts\java-win.bat com.jogamp.opengl.demos.av.MovieCube %* +REM scripts\java-win.bat com.jogamp.opengl.demos.av.MovieSimple %* +REM scripts\java-win.bat com.jogamp.opengl.demos.av.CrossFadePlayer %* +REM scripts\java-win.bat com.jogamp.opengl.demos.av.StereoDemo01 %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.perf.TestPerf001RawInit00NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit01AWT %* @@ -217,17 +222,35 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscre REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT -REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.TestRegionRendererNEWT01 -scripts\java-win.bat com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 %* -REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 -REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState02NEWT -REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState02NEWT -REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.demos.ui.UINewtDemo01 %* -REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo %* -REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo %* -REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo %* -REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtCanvasAWTDemo %* +REM +REM Graph +REM +REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.TestFontScale01NOUI %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.TestRegionRendererNEWT01 %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.TestFontsNEWT00 %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.TestTextRendererNEWTBugXXXX %* + +REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT21 %* + +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.GPUTextNewtDemo %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.GPURegionNewtDemo %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UIShapeDemo01 %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UITypeDemo01 %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo00 %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo01 %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo02 %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo03 %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo10 %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo11 %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo20 %* + +scripts\java-win.bat com.jogamp.opengl.demos.av.MovieCube %* +REM scripts\java-win.bat com.jogamp.opengl.demos.av.MovieSimple %* + REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.awt.TestBug461FBOSupersamplingSwingAWT REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 -REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 %* diff --git a/make/scripts/tests-x64-dbg.bat b/make/scripts/tests-x64-dbg.bat index 72a34afa6..4c7f44236 100755 --- a/make/scripts/tests-x64-dbg.bat +++ b/make/scripts/tests-x64-dbg.bat @@ -20,7 +20,7 @@ REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\PVR set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;C:\temp;%MESA3D_LIB%;%FFMPEG_LIB%;%PATH%
echo PATH %PATH%
-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\joal\%BLD_SUB%\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt.jar
+set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;%BLD_DIR%\jar\jogl-demos.jar;..\..\joal\%BLD_SUB%\jar\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt.jar
echo CP_ALL %CP_ALL%
@@ -44,8 +44,8 @@ REM set D_ARGS="-Dnativewindow.debug.GraphicsConfiguration -Djogl.debug.Capabili REM set D_ARGS="-Djogamp.debug.IOUtil"
REM set D_ARGS="-Djogl.debug.GLSLCode"
REM set D_ARGS="-Djogl.debug.GLSLCode" "-Djogl.debug.GLMediaPlayer"
-set D_ARGS="-Djogl.debug.GLMediaPlayer"
-REM set D_ARGS="-Djogl.debug.GLMediaPlayer" "-Djogl.debug.AudioSink"
+REM set D_ARGS="-Djogl.debug.GLMediaPlayer"
+set D_ARGS="-Djogl.debug.GLMediaPlayer" "-Djogl.debug.AudioSink"
REM set D_ARGS="-Djogl.debug.GLMediaPlayer" "-Djogl.debug.GLMediaPlayer.Native"
REM set D_ARGS="-Djogl.debug.GLMediaPlayer" "-Djogl.debug.GLMediaPlayer.Native" "-Djogamp.debug.NativeLibrary=true"
REM set D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25" "-Djogl.debug.GLMediaPlayer"
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat index a34a078ec..a9b6580ef 100755 --- a/make/scripts/tests-x64.bat +++ b/make/scripts/tests-x64.bat @@ -21,7 +21,7 @@ set BLD_DIR=..\%BLD_SUB% REM set LIB_DIR=%cd%\%BLD_DIR%\lib;%cd%\..\..\gluegen\%BLD_SUB%\obj
set LIB_DIR=
-set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\joal\%BLD_SUB%\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt.jar
+set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\atomic\oculusvr.jar;%BLD_DIR%\jar\jogl-test.jar;%BLD_DIR%\jar\jogl-demos.jar;..\..\joal\%BLD_SUB%\jar\joal.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\%BLD_SUB%\gluegen-test-util.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86_64\swt.jar
echo CP_ALL %CP_ALL%
REM set MODULE_ARGS=--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.java2d=ALL-UNNAMED
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 847704e46..c2b9fea19 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -1033,12 +1033,12 @@ function testawtswt() { #testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo10 $* #testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo11 $* #testnoawt com.jogamp.opengl.demos.graph.ui.UISceneDemo20 $* -testnoawt com.jogamp.opengl.demos.graph.ui.UILayoutGrid01 $* +#testnoawt com.jogamp.opengl.demos.graph.ui.UILayoutGrid01 $* #testnoawt com.jogamp.opengl.demos.graph.ui.UILayoutBox01 $* #testnoawt com.jogamp.opengl.demos.graph.ui.FontView01 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT21 $* -#testnoawt com.jogamp.opengl.demos.av.MovieCube $* +testnoawt com.jogamp.opengl.demos.av.MovieCube $* #testnoawt com.jogamp.opengl.demos.av.MovieSimple $* #testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* |