JOGL junit.run: Add 32bit tests for OSX (fat binaries)

2 files changed, 37 insertions, 9 deletions

diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 57647ef65..7a06cef31 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -245,7 +245,9 @@
                  config="${jawt.cfg}"
                  includeRefid="stub.includes.fileset.platform"
                  literalInclude="${stub.includes.gluegen.gg}, ${stub.includes}/jni"
-                 emitter="com.jogamp.gluegen.JavaEmitter">
+                 emitter="com.jogamp.gluegen.JavaEmitter"
+                 debug="false"
+                 dumpCPP="false">
             <classpath refid="gluegen.classpath" />
         </gluegen>
     </target>
@@ -286,7 +288,7 @@
             <param name="jawt.platform.header"                   value="${stub.includes}/jni/win32/jawt_md.h" />
         </antcall>          
 
-        <echo message="Generating platform-specifics: MaxOsX" />
+        <echo message="Generating platform-specifics: MacOSX" />
         <antcall target="java.generate.platforms" inheritRefs="true">
           <param name="window.os.system"                     value="macosx"/>
           <param name="jawt.cfg"                             value="${config.nativewindow}/jawt-macosx.cfg" />
diff --git a/make/build-test.xml b/make/build-test.xml
index 5f975d8e1..53fe3f610 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -42,6 +42,8 @@
     <target name="clean" description="Remove all build products" depends="declare.common">
         <delete includeEmptyDirs="true" quiet="true">
             <fileset dir="${build.test}" />
+            <fileset dir="${build}/test/results-x32"/>
+            <fileset dir="${build}/test/results-x64"/>
             <fileset dir="." includes="*.tga" />
             <fileset file="${jogl.test.jar}" />
         </delete>
@@ -132,6 +134,7 @@
                  output="${test.class.result.file}">
                 <env key="${system.env.library.path}" path="${obj.all.paths}"/>
                 <env key="CLASSPATH" value="${junit_jogl_awt.run.jars}"/>
+                <arg line="${jvmDataModel.arg}"/>
                 <arg value="-Djava.library.path=${obj.all.paths}"/>
                 <!--
                 <arg line="-Dnewt.debug.EDT"/>
@@ -477,19 +480,42 @@
     </target>
 
     <target name="test.auto.run" depends="junit.run"/>
-    <target name="junit.run" depends="junit.run.noui,junit.run.newt.headless,junit.run.awt,junit.run.newt.awt,junit.run.swt.headless,junit.run.swt.awt">
-        <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
+
+        <condition property="jvmarg.mainthrd" value="-XstartOnFirstThread"><isset property="isOSX"/></condition>
+
+    <target name="junit.run.tests" depends="junit.run.noui,junit.run.newt.headless,junit.run.awt,junit.run.newt.awt,junit.run.swt.headless,junit.run.swt.awt"/>
+
+    <target name="junit.run.d32" if="isOSX">
+        <var name="jvmDataModel.arg" unset="true"/>
+        <var name="jvmDataModel.arg" value="-d32"/>
+
+        <antcall target="junit.run.tests" inheritRefs="true" inheritAll="true"/>
+
+        <mkdir dir="${build}/test/results-x32"/>
+        <move todir="${build}/test/results-x32">
+            <fileset dir="." includes="*.tga" />
+        </move>
+        <move todir="${build}/test/results-x32">
+            <fileset dir="${results.test}" includes="**" />
+        </move>
+
+        <var name="jvmDataModel.arg" unset="true"/>
+        <var name="jvmDataModel.arg" value="-d64"/>
     </target>
 
-    <!-- updates / create the test results zip file -->
-    <target name="test-zip-archive" depends="declare.common">
+    <target name="junit.run" depends="declare.common, junit.run.d32, junit.run.tests">
+        <mkdir dir="${results.test}" />
         <move todir="${results.test}">
             <fileset dir="." includes="*.tga" />
         </move>
-        <mkdir dir="${results.test}" />
+        <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/>
+    </target>
+
+    <!-- updates / create the test results zip file -->
+    <target name="test-zip-archive" depends="declare.common">
         <archive.7z destfile="${build}/${test.archive.name}.7z"
-                    basedir="${results.test}" 
-                    includes="**" />
+                    basedir="${project.root}" 
+                    includes="${rootrel.build}/test/results ${rootrel.build}/test/results-x64 ${rootrel.build}/test/results-x32" />
     </target>
 
     <!-- ================================================================== -->