diff options
Diffstat (limited to 'make')
| -rwxr-xr-x | make/scripts/tests-linux-aarch64.sh | 9 | ||||
| -rwxr-xr-x | make/scripts/tests-win.bat | 2 | ||||
| -rwxr-xr-x | make/scripts/tests-x64.sh | 5 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/make/scripts/tests-linux-aarch64.sh b/make/scripts/tests-linux-aarch64.sh index f1b4de19d..bc59dacf0 100755 --- a/make/scripts/tests-linux-aarch64.sh +++ b/make/scripts/tests-linux-aarch64.sh @@ -1,8 +1,11 @@ #! /bin/bash -spath=`dirname $0` +SDIR=`dirname $0` -. $spath/tests.sh `which java` -DummyArg ../build-linux-aarch64 $* -#. $spath/tests.sh /usr/lib/jvm/java-11-openjdk-arm64/bin/java -DummyArg ../build-linux-aarch64 $* +#JAVA_CMD=/opt-linux-arm64/zulu19.32.13-ca-jdk19.0.2-linux_aarch64/bin/java +#JAVA_CMD=/usr/lib/jvm/java-11-openjdk-arm64/bin/java +JAVA_CMD=`which java` + +. $SDIR/tests.sh $JAVA_CMD -DummyArg ../build-linux-aarch64 $* diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index cfdef2de6..7b2c84102 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -218,7 +218,7 @@ 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.TestTextRendererNEWT00 +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 diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index 5da1c4c20..1da3b12f0 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -21,5 +21,8 @@ fi export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86_64/swt.jar #export SWT_CLASSPATH=/usr/local/projects/JOGL/SWT/swt-4.3.0/gtk-linux-x86_64/swt-debug.jar -. $SDIR/tests.sh `which java` -DummyArg ../build-x86_64 $* +#JAVA_CMD=/opt-linux-x86_64/zulu19.32.13-ca-jdk19.0.2-linux_x64/bin/java +JAVA_CMD=`which java` + +. $SDIR/tests.sh $JAVA_CMD -DummyArg ../build-x86_64 $* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index e10882787..81327185a 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -953,7 +953,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.graph.TestFontsNEWT00 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWTBugXXXX $* -#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT00 $* +#testnoawt com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $* @@ -991,8 +991,8 @@ function testawtswt() { # Linux DRM/GBM # -#testmobile com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT00 $* -testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT00 $* +#testmobile com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 $* +testnoawt com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 $* #testmobile com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $* #testmobile com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $* #testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* |