summaryrefslogtreecommitdiffstats
path: root/make/scripts
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-03-09 05:31:04 +0100
committerSven Gothel <[email protected]>2023-03-09 05:31:04 +0100
commit4cc2787766d1d692c668d0cabd9f4619de396f72 (patch)
tree416e827adb382850325f5c9cb05a6448a9341b01 /make/scripts
parent0571fafebee846b77de5740d23fc141810897f84 (diff)
Misc: Add MonitorDevice.perMMToPerInch(..); Drop unused RegionRenderer.init(..) renderModes argument
Diffstat (limited to 'make/scripts')
-rwxr-xr-xmake/scripts/tests-linux-aarch64.sh2
-rwxr-xr-xmake/scripts/tests-rpi4b-aarch64.sh2
-rw-r--r--make/scripts/tests.sh12
3 files changed, 8 insertions, 8 deletions
diff --git a/make/scripts/tests-linux-aarch64.sh b/make/scripts/tests-linux-aarch64.sh
index 1e8947d06..d7fd74fe1 100755
--- a/make/scripts/tests-linux-aarch64.sh
+++ b/make/scripts/tests-linux-aarch64.sh
@@ -6,7 +6,7 @@ SDIR=`dirname $0`
#JAVA_CMD=/usr/lib/jvm/java-11-openjdk-arm64/bin/java
JAVA_CMD=`which java`
-# D_ARGS="-Dnewt.ws.mmwidth=150 -Dnewt.ws.mmheight=90"
+# D2_ARGS="-Dnewt.ws.mmwidth=150 -Dnewt.ws.mmheight=90"
. $SDIR/tests.sh $JAVA_CMD -DummyArg ../build-linux-aarch64 $*
diff --git a/make/scripts/tests-rpi4b-aarch64.sh b/make/scripts/tests-rpi4b-aarch64.sh
index 101d6e445..957929fa2 100755
--- a/make/scripts/tests-rpi4b-aarch64.sh
+++ b/make/scripts/tests-rpi4b-aarch64.sh
@@ -6,7 +6,7 @@ SDIR=`dirname $0`
#JAVA_CMD=/usr/lib/jvm/java-11-openjdk-arm64/bin/java
JAVA_CMD=`which java`
-D_ARGS="-Dnewt.ws.mmwidth=150 -Dnewt.ws.mmheight=90"
+D2_ARGS="-Dnewt.ws.mmwidth=150 -Dnewt.ws.mmheight=90"
. $SDIR/tests.sh $JAVA_CMD -DummyArg ../build-linux-aarch64 $*
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 3e696e928..dbb8ccb27 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -432,10 +432,10 @@ function jrun() {
# export __GL_THREADED_OPTIMIZATIONS=1
echo __GL_THREADED_OPTIMIZATIONS $__GL_THREADED_OPTIMIZATIONS
echo
- echo "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
- #gdb --args "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
- "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
- #strace $javaexe $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $*
+ echo "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D2_ARGS $D_ARGS $C_ARG $*
+ #gdb --args "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D2_ARGS $D_ARGS $C_ARG $*
+ "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D2_ARGS $D_ARGS $C_ARG $*
+ #strace $javaexe $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D2_ARGS $D_ARGS $C_ARG $*
echo
echo "Test End: $*"
echo
@@ -960,7 +960,7 @@ function testawtswt() {
#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 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo $*
#testnoawt com.jogamp.opengl.test.junit.graph.demos.UIShapeDemo01 $*
@@ -999,7 +999,7 @@ testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $*
#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 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
+testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
#testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $*
#testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $*
#testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*