Bug 1411 - Unit Test Subset for DRM/GBM JOGL(EGL) and NEWT

First step disables all AWT and SWT unit tests.
sgothel · Dec 6, 2019 · b992423 · b992423
1 parent abde7e9
commit b992423
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 20 deletions.
diff --git a/make/build-common.xml b/make/build-common.xml
@@ -203,15 +203,20 @@
         <echo message="plugin3-jars.available: ${plugin3-jars.available} ${plugin3.jar}" />
 
         <condition property="isSWTRuntimeAvailable">
-          <or>
-              <istrue value="${isWindowsAMD64}" />
-              <istrue value="${isWindowsX86}" />
-              <istrue value="${isLinuxAMD64}" />
-              <istrue value="${isLinuxX86}" />
-              <istrue value="${isOSX}" />
-              <istrue value="${isSolarisX86}" />
-              <istrue value="${isSolarisSparc}" />
-          </or>
+          <and>
+              <not>
+                  <isset property="setup.noSWT" />
+              </not>
+              <or>
+                  <istrue value="${isWindowsAMD64}" />
+                  <istrue value="${isWindowsX86}" />
+                  <istrue value="${isLinuxAMD64}" />
+                  <istrue value="${isLinuxX86}" />
+                  <istrue value="${isOSX}" />
+                  <istrue value="${isSolarisX86}" />
+                  <istrue value="${isSolarisSparc}" />
+              </or>
+          </and>
         </condition>
         <echo message="isSWTRuntimeAvailable=${isSWTRuntimeAvailable}" />
 

diff --git a/make/build-test.xml b/make/build-test.xml
@@ -447,7 +447,7 @@
         </junit>
     </target>
 
-    <target name="generic.junit.run.awt">
+    <target name="generic.junit.run.awt" unless="setup.noAWT">
         <!-- attribute name="generic.junit.run.awt.include.pattern" -->
 
         <!-- Test*AWT* -->
@@ -487,13 +487,13 @@
         <var name="generic.junit.run.awt.include.pattern" unset="true"/>
     </target>
 
-    <target name="junit.run.awt" depends="test.compile">
+    <target name="junit.run.awt" depends="test.compile" unless="setup.noAWT">
         <!-- Test*AWT* -->
         <property name="generic.junit.run.awt.include.pattern" value="${java.dir.junit}/**/Test*AWT*"/>
         <antcall target="generic.junit.run.awt" inheritRefs="true" inheritAll="true"/>
     </target>
 
-    <target name="generic.junit.run.newt.awt">
+    <target name="generic.junit.run.newt.awt" unless="setup.noAWT">
         <!-- attribute name="generic.junit.run.newt.awt.include.pattern" -->
 
         <!-- Test*AWT* -->
@@ -534,7 +534,7 @@
         <var name="generic.junit.run.newt.awt.include.pattern" unset="true"/>
     </target>
 
-    <target name="junit.run.newt.awt" depends="test.compile">
+    <target name="junit.run.newt.awt" depends="test.compile" unless="setup.noAWT">
         <!-- Test*AWT* -->
         <property name="generic.junit.run.newt.awt.include.pattern" value="${java.dir.junit}/**/newt/**/Test*AWT*"/>
         <antcall target="generic.junit.run.newt.awt" inheritRefs="true" inheritAll="true"/>
@@ -654,7 +654,7 @@
         </apply>
     </target>
 
-    <target name="generic.junit.run.swt.headless">
+    <target name="generic.junit.run.swt.headless" unless="setup.noSWT">
         <!-- attribute name="generic.junit.run.swt.headless.include.pattern" -->
 
         <!-- Test*SWTHeadless* 
@@ -721,13 +721,13 @@
         <var name="generic.junit.run.swt.headless.include.pattern" unset="true"/>
     </target>  
 
-    <target name="junit.run.swt.headless" depends="test.compile" description="Runs all pure SWT tests." if="isSWTRuntimeAvailable">
+    <target name="junit.run.swt.headless" depends="test.compile" description="Runs all pure SWT tests." unless="setup.noSWT" if="isSWTRuntimeAvailable">
         <!-- Test*SWTHeadless* -->
         <property name="generic.junit.run.swt.headless.include.pattern" value="${java.dir.junit}/**/Test*SWT*"/>
         <antcall target="generic.junit.run.swt.headless" inheritRefs="true" inheritAll="true"/>
     </target>
 
-    <target name="junit.run.swt.awt" depends="test.compile" description="Runs all pure SWT AWT tests." if="isSWTRuntimeAvailable">
+    <target name="junit.run.swt.awt" depends="test.compile" description="Runs all pure SWT AWT tests." unless="setup.noSWT" if="isSWTRuntimeAvailable">
         <!-- Test*SWT* 
 
              Emulation of junit task.
@@ -794,10 +794,10 @@
     <target name="junit.run.local" unless="isCrosscompilation" >
         <antcall target="junit.run.noui"          inheritRefs="true" inheritAll="true"/>
         <antcall target="junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-        <antcall target="junit.run.awt"           inheritRefs="true" inheritAll="true"/>
-        <antcall target="junit.run.newt.awt"      inheritRefs="true" inheritAll="true"/>
-        <antcall target="junit.run.swt.headless"  inheritRefs="true" inheritAll="true"/>
-        <antcall target="junit.run.swt.awt"       inheritRefs="true" inheritAll="true"/>
+        <antcall target="junit.run.awt"           inheritRefs="true" inheritAll="true"/> <!-- unless="setup.noAWT"-->
+        <antcall target="junit.run.newt.awt"      inheritRefs="true" inheritAll="true"/> <!-- unless="setup.noAWT"-->
+        <antcall target="junit.run.swt.headless"  inheritRefs="true" inheritAll="true"/> <!-- unless="setup.noSWT" if="isSWTRuntimeAvailable"-->
+        <antcall target="junit.run.swt.awt"       inheritRefs="true" inheritAll="true"/> <!-- unless="setup.noSWT" if="isSWTRuntimeAvailable"-->
     </target>
 
     <target name="junit.run.local.osx.d32" if="isOSX">

diff --git a/make/scripts/junit-linux-armv6hf-headless.sh b/make/scripts/junit-linux-armv6hf-headless.sh
@@ -0,0 +1,31 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
+
+LOGF=junit.jogl.all.linux-armv6hf-headless.log
+rm -f $LOGF
+
+export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml"
+
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+# BUILD_ARCHIVE=true \
+ant  \
+    -Dsetup.noAWT=true \
+    -Dsetup.noSWT=true \
+    -Drootrel.build=build-linux-armv6hf \
+    -Djunit.run.arg0="--illegal-access=warn" \
+    -Dsetup.addNativeKD=true \
+    -Dsetup.addNativeOpenMAX=true \
+    -Dsetup.addNativeBroadcom=true \
+    junit.run 2>&1 | tee -a $LOGF
+
diff --git a/make/scripts/junit-linux-x86_64-headless.sh b/make/scripts/junit-linux-x86_64-headless.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+SDIR=`dirname $0` 
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
+
+LOGF=junit.jogl.all.linux-x86_64-headless.log
+rm -f $LOGF
+
+export SOURCE_LEVEL=1.8
+export TARGET_LEVEL=1.8
+export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+# BUILD_ARCHIVE=true \
+ant  \
+    -Dsetup.noAWT=true \
+    -Dsetup.noSWT=true \
+    -Drootrel.build=build-x86_64 \
+    -Djunit.run.arg0="--illegal-access=warn" \
+    junit.run 2>&1 | tee -a $LOGF
+