Fix SWT test on OSX 32/64 bit ; Fix TestSWTAWT01GL for OSX

Fix SWT test on OSX 32/64 bit:
  - Pick 32bit SWT for 32bit tests

Fix TestSWTAWT01GL for OSX:
  - Using proper thread for AWT and SWT actions, platform agnostic
    but required for OSX.

  - Enable SWT*AWT* tests on OSX

2 files changed, 14 insertions, 8 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index cdc4bba1f..79d55b5f2 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -145,7 +145,8 @@
         <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
           <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar">
+        <property name="swt-cocoa-macosx-x86_64.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar"/>
+        <condition property="swt.jar" value="${swt-cocoa-macosx-x86_64.jar}">
           <and>
             <istrue value="${isOSX}" />
             <or>
@@ -154,7 +155,8 @@
             </or>                
           </and>
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar">
+        <property name="swt-cocoa-macosx-x86_32.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar"/>
+        <condition property="swt.jar" value="${swt-cocoa-macosx-x86_32.jar}">
           <and>
             <istrue value="${isOSX}" />
             <or>
@@ -494,6 +496,8 @@
         <property name="junit_jogl_android.run.jars"
                   value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-android.jar}${path.separator}${jogl.test.jar}"/>
 
+        <!-- Dummy extra CLASSPATH value, maybe overwritten -->  
+        <property name="junit_extra_classpath" value=""/>
 
         <!-- The location and name of the configuration ANT file that will 
            - validate to ensure that all user-define variables are set. -->
diff --git a/make/build-test.xml b/make/build-test.xml
index 7d5582b03..533ca301c 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -370,7 +370,7 @@
                  relative="true"
                  failonerror="false">
                 <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-                <env key="CLASSPATH" value="${junit_jogl_swt.run.jars}"/>
+                <env key="CLASSPATH" value="${junit_extra_classpath}${junit_jogl_swt.run.jars}"/>
                 <arg line="${jvmDataModel.arg}"/>
                 <arg value="-Djava.library.path=${obj.all.paths}"/>
                 <arg line="${jvmarg.headless}"/>
@@ -398,14 +398,12 @@
         </for>
     </target>
 
-    <!-- currently freezes OSX -->
-    <target name="junit.run.swt.awt" depends="test.compile" description="Runs all SWT_AWT tests." if="isSWTRuntimeAvailable" unless="isOSX">
-      <!-- Test*SWT* -->
+    <target name="junit.run.swt.awt" depends="test.compile" description="Runs all SWT_AWT tests." if="isSWTRuntimeAvailable">
+      <!-- Test*SWT*AWT* -->
       <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
           <env key="${system.env.library.path}" path="${obj.all.paths}"/>
           <jvmarg value="${jvmDataModel.arg}"/>
           <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
-          <jvmarg value="${jvmarg.mainthrd}"/>
 
           <!--
           <jvmarg value="-Djogl.debug=all"/>
@@ -420,7 +418,7 @@
 
           <formatter usefile="false" type="plain"/>
           <formatter usefile="true" type="xml"/>
-          <classpath refid="junit_jogl_swt.run.classpath"/>
+          <classpath path="${junit_extra_classpath}${junit_jogl_swt.run.jars}"/>
 
           <batchtest todir="${results.test}">
             <fileset dir="${classes}">
@@ -478,6 +476,8 @@
     <target name="junit.run.d32" if="isOSX">
         <var name="jvmDataModel.arg" unset="true"/>
         <var name="jvmDataModel.arg" value="-d32"/>
+        <var name="junit_extra_classpath" unset="true"/>
+        <var name="junit_extra_classpath" value="${swt-cocoa-macosx-x86_32.jar}:"/>
 
         <antcall target="junit.run.tests" inheritRefs="true" inheritAll="true"/>
 
@@ -492,6 +492,8 @@
 
         <var name="jvmDataModel.arg" unset="true"/>
         <var name="jvmDataModel.arg" value="-d64"/>
+        <var name="junit_extra_classpath" unset="true"/>
+        <var name="junit_extra_classpath" value=""/>
     </target>
 
     <target name="junit.run.settings">