Fix linux armv7 non-cross script / Disable ScreenMode on linux armv7 unit tests (build scripts)

Disable ScreenMode on Linux-ARM-Omap4 for example,
where XRandR calls consume up to 3s per test.

5 files changed, 9 insertions, 8 deletions

diff --git a/make/scripts/make.jogl.all.android-armv7-cross.sh b/make/scripts/make.jogl.all.android-armv7-cross.sh
index 37a5c4c35..20c90d160 100755
--- a/make/scripts/make.jogl.all.android-armv7-cross.sh
+++ b/make/scripts/make.jogl.all.android-armv7-cross.sh
@@ -105,6 +105,7 @@ ant \
     -DisUnix=true \
     -DisAndroid=true \
     -DisAndroidARMv7=true \
+    -DjvmDataModel.arg="-Djnlp.no.jvm.data.model.set=true" \
     -DisCrosscompilation=true \
     \
     $* 2>&1 | tee -a make.jogl.all.android-armv7-cross.log
diff --git a/make/scripts/make.jogl.all.linux-armv7-cross.sh b/make/scripts/make.jogl.all.linux-armv7-cross.sh
index 007cb8076..20421a099 100755
--- a/make/scripts/make.jogl.all.linux-armv7-cross.sh
+++ b/make/scripts/make.jogl.all.linux-armv7-cross.sh
@@ -22,6 +22,7 @@ export HOST_RSYNC_ROOT=PROJECTS/JOGL
 
 export TARGET_UID=jogamp
 export TARGET_IP=panda01
+#export TARGET_IP=jautab02
 export TARGET_ROOT=/home/jogamp/projects-cross
 export TARGET_ANT_HOME=/usr/share/ant
 
@@ -35,6 +36,8 @@ ant \
     -DisLinux=true \
     -DisLinuxARMv7=true \
     -DisX11=true \
+    -DjvmDataModel.arg="-Djnlp.no.jvm.data.model.set=true" \
+    -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
     -DisCrosscompilation=true \
     \
     -Dsetup.addNativeKD=true \
diff --git a/make/scripts/make.jogl.all.linux-armv7.sh b/make/scripts/make.jogl.all.linux-armv7.sh
index 91072023f..203faf16c 100755
--- a/make/scripts/make.jogl.all.linux-armv7.sh
+++ b/make/scripts/make.jogl.all.linux-armv7.sh
@@ -15,14 +15,9 @@ export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm
 
 ant \
     -Drootrel.build=build-linux-armv7 \
-    -Dgluegen.cpptasks.detected.os=true \
-    -DisUnix=true \
-    -DisLinux=true \
-    -DisLinuxARMv7=true \
-    -DisX11=true \
-    \
     -Dsetup.addNativeKD=true \
     -Dsetup.addNativeOpenMAX=true \
     -Dsetup.addNativeBroadcomEGL=true \
+    -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
     $* 2>&1 | tee make.jogl.all.linux-armv7.log
 
diff --git a/make/scripts/targetcommand-1.sh b/make/scripts/targetcommand-1.sh
index b50b0ff6d..1987441ba 100755
--- a/make/scripts/targetcommand-1.sh
+++ b/make/scripts/targetcommand-1.sh
@@ -2,7 +2,8 @@
 
 THISDIR=`pwd`
 
-XTRA_FLAGS="-Dnewt.debug.Screen"
+XTRA_FLAGS="-Dnewt.test.Screen.disableScreenMode"
+#XTRA_FLAGS="-Dnewt.debug.Screen"
 #XTRA_FLAGS="-Dnewt.debug.Window -Djogl.debug.EGL -Djogl.debug.GLContext -Djogl.debug.GLDrawable"
 #XTRA_FLAGS="-Djogl.debug.EGL"
 #XTRA_FLAGS="-Djogl.debug.GraphicsConfiguration"
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index cda1aadc1..b844b49f7 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -50,6 +50,7 @@ function jrun() {
     swton=$1
     shift
 
+    #D_ARGS="-Dnewt.test.Screen.disableScreenMode"
     #D_ARGS="-Djogl.debug.ExtensionAvailabilityCache -Djogl.debug=all -Dnativewindow.debug=all -Djogamp.debug.ProcAddressHelper=true -Djogamp.debug.NativeLibrary=true -Djogamp.debug.NativeLibrary.Lookup=true"
     #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
     #D_ARGS="-Dnewt.debug.MainThread"
@@ -72,7 +73,7 @@ function jrun() {
     #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock -Dnativewindow.debug.ToolkitLock.TraceLock"
     #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000 -Djogamp.debug.Lock -Dnativewindow.debug.X11Util"
     #D_ARGS="-Dnewt.debug.EDT -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator -Dnewt.debug.Display -Dnewt.debug.Screen"
-    D_ARGS="-Dnewt.debug.Screen"
+    #D_ARGS="-Dnewt.debug.Screen"
     #D_ARGS="-Dnewt.debug.Window -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator"
     #D_ARGS="-Djogl.debug.Animator -Dnewt.debug=all"
     #D_ARGS="-Dnewt.debug.EDT -Dnewt.debug.Display -Dnativewindow.debug.X11Util -Djogl.debug.GLDrawable -Djogl.debug.GLCanvas"