From c5fabde01babfdd07c72347ff17ac0705b8c6c5a Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 9 Dec 2019 07:40:14 +0100
Subject: Bug 1411 DRM/GBM JOGL: Fix 'junit.run.console' unit test target, use
 it in respective (renamed) scripts.

Added junit.run.console target in build.xml

build-test.xml
- Moves all results.test artifact moving from current directory into test-zip-archive target,
  reducing duplication.

- junit.run.console: Added proper dependencies etc

Renamed scripts to match junit.run.console:
  junit-linux-x86_64-headless.sh -> junit-linux-x86_64-console.sh
  junit-linux-armv6hf-headless.sh -> junit-linux-armv6hf-console.sh
---
 make/build-test.xml                          | 123 +++++++++++----------------
 make/build.xml                               |   4 +
 make/scripts/junit-linux-armv6hf-console.sh  |  34 ++++++++
 make/scripts/junit-linux-armv6hf-headless.sh |  31 -------
 make/scripts/junit-linux-x86_64-console.sh   |  29 +++++++
 make/scripts/junit-linux-x86_64-headless.sh  |  26 ------
 6 files changed, 116 insertions(+), 131 deletions(-)
 create mode 100755 make/scripts/junit-linux-armv6hf-console.sh
 delete mode 100755 make/scripts/junit-linux-armv6hf-headless.sh
 create mode 100755 make/scripts/junit-linux-x86_64-console.sh
 delete mode 100755 make/scripts/junit-linux-x86_64-headless.sh

diff --git a/make/build-test.xml b/make/build-test.xml
index 5695cf8c7..a7bd84e64 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -791,46 +791,6 @@
         </for>
     </target>
 
-    <target name="junit.run.console" depends="test.compile">
-        <antcall target="junit.run.noui"          inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/acore/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/caps/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/glsl/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/perf/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/tile/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/util/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/texture/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/newt/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/newt/mm/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-
-        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/graph/Test*NEWT*"/>
-        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
-    </target>
-
     <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"/>
@@ -1232,45 +1192,67 @@ ${line.separator}
     </target>
 
     <target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled">
-        <mkdir dir="${results.test}" />
-        <move todir="${results.test}">
-            <fileset dir="." includes="*.ps" />
-            <fileset dir="." includes="*.pdf" />
-            <fileset dir="." includes="*.png" />
-            <fileset dir="." includes="*.pam" />
-            <fileset dir="." includes="*.tga" />
-            <fileset dir="." includes="hs_err_pid*.log" />
-        </move>
+        <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
+    </target>
+
+    <target name="junit.run.console" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled, test.compile" unless="junit.is.disabled">
+        <antcall target="junit.run.noui"          inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/acore/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/caps/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/glsl/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/perf/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/tile/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/util/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/jogl/texture/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/newt/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/newt/mm/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
+        <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/com/jogamp/opengl/test/junit/graph/Test*NEWT*"/>
+        <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/>
+
         <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="junit.manual.run.remote.ssh.newt" depends="junit.run.settings, junit.run.remote.ssh.newt">
-        <mkdir dir="${results.test}" />
-        <move todir="${results.test}">
-            <fileset dir="." includes="*.ps" />
-            <fileset dir="." includes="*.pdf" />
-            <fileset dir="." includes="*.png" />
-            <fileset dir="." includes="*.pam" />
-            <fileset dir="." includes="*.tga" />
-            <fileset dir="." includes="hs_err_pid*.log" />
-        </move>
         <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="junit.manual.run.remote.ssh.awt" depends="junit.run.settings, junit.run.remote.ssh.awt">
-        <mkdir dir="${results.test}" />
-        <move todir="${results.test}">
-            <fileset dir="." includes="*.ps" />
-            <fileset dir="." includes="*.pdf" />
-            <fileset dir="." includes="*.png" />
-            <fileset dir="." includes="*.pam" />
-            <fileset dir="." includes="*.tga" />
-            <fileset dir="." includes="hs_err_pid*.log" />
-        </move>
         <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="junit.manual.run.remote.ssh.all" depends="junit.run.settings, junit.run.remote.ssh.all">
+        <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
+    </target>
+
+    <target name="test.auto.run" depends="junit.run"/>
+
+    <!-- updates / create the test results zip file -->
+    <target name="test-zip-archive" depends="declare.common">
         <mkdir dir="${results.test}" />
         <move todir="${results.test}">
             <fileset dir="." includes="*.ps" />
@@ -1280,13 +1262,6 @@ ${line.separator}
             <fileset dir="." includes="*.tga" />
             <fileset dir="." includes="hs_err_pid*.log" />
         </move>
-        <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
-    </target>
-
-    <target name="test.auto.run" depends="junit.run"/>
-
-    <!-- updates / create the test results zip file -->
-    <target name="test-zip-archive" depends="declare.common">
         <archive.7z destfile="${build}/${test.archive.name}.7z"
                     basedir="${project.root}" 
                     includes="${rootrel.build}/test/results ${rootrel.build}/test/results-x64 ${rootrel.build}/test/results-x32" />
diff --git a/make/build.xml b/make/build.xml
index 4ed5d77d5..373c96455 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -28,6 +28,10 @@
       <ant antfile="build-test.xml" target="junit.run" inheritRefs="true" inheritAll="true"/>
     </target>
 
+    <target name="junit.run.console" description="Run automated junit tests in nativewindow, jogl and newt projects (console only)">
+      <ant antfile="build-test.xml" target="junit.run.console" inheritRefs="true" inheritAll="true"/>
+    </target>
+
     <target name="test.manual.run" description="Run manual operated tests in nativewindow, jogl and newt projects">
       <ant antfile="build-test.xml" target="test.manual.run" inheritRefs="true" inheritAll="true"/>
     </target>
diff --git a/make/scripts/junit-linux-armv6hf-console.sh b/make/scripts/junit-linux-armv6hf-console.sh
new file mode 100755
index 000000000..e9379e9f9
--- /dev/null
+++ b/make/scripts/junit-linux-armv6hf-console.sh
@@ -0,0 +1,34 @@
+#! /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-console.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"
+
+#TARGET=junit.run
+TARGET=junit.run.console
+
+# 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 \
+    $TARGET 2>&1 | tee -a $LOGF
+
diff --git a/make/scripts/junit-linux-armv6hf-headless.sh b/make/scripts/junit-linux-armv6hf-headless.sh
deleted file mode 100755
index 3561d5b82..000000000
--- a/make/scripts/junit-linux-armv6hf-headless.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /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-console.sh b/make/scripts/junit-linux-x86_64-console.sh
new file mode 100755
index 000000000..076c3a088
--- /dev/null
+++ b/make/scripts/junit-linux-x86_64-console.sh
@@ -0,0 +1,29 @@
+#! /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-console.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"
+
+#TARGET=junit.run
+TARGET=junit.run.console
+
+# BUILD_ARCHIVE=true \
+ant  \
+    -Dsetup.noAWT=true \
+    -Dsetup.noSWT=true \
+    -Drootrel.build=build-x86_64 \
+    -Djunit.run.arg0="--illegal-access=warn" \
+    $TARGET 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
deleted file mode 100755
index 561043c49..000000000
--- a/make/scripts/junit-linux-x86_64-headless.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /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
-
-- 
cgit v1.2.3