From e68566febb69f6aca4bdf39d1d841c17df894631 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 4 Apr 2013 16:27:11 +0200
Subject: SWT unit tests: Sort w/ AWT and Headless - Fix threading w/ AWT.

This especially impacts (fixes) Mac OSX.
---
 make/build-test.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'make/build-test.xml')

diff --git a/make/build-test.xml b/make/build-test.xml
index dd072bddb..3d9c31d83 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -521,7 +521,8 @@
         <for param="test.class.path.m" keepgoing="true">
             <!-- results in absolute path -->
             <fileset dir="${classes}">
-                <include name="${java.dir.junit}/**/Test*SWTHeadless*"/>
+                <include name="${java.dir.junit}/**/Test*SWT*"/>
+                <exclude name="**/*AWT*"/>
                 <exclude name="**/*$$*"/>
             </fileset>
           <sequential>
@@ -550,6 +551,7 @@
                 <arg line="${jvmDataModel.arg}"/>
                 <arg value="-Djava.library.path=${obj.all.paths}"/>
                 <arg line="${jvmarg.headless}"/>
+                <arg line="${jvmarg.mainthrd}"/>
                 <!--
                 <arg line="-Dnewt.debug.EDT"/>
                 -->
@@ -583,9 +585,8 @@
         <for param="test.class.path.m" keepgoing="true">
             <!-- results in absolute path -->
             <fileset dir="${classes}">
-                <include name="${java.dir.junit}/**/Test*SWT*"/>
+                <include name="${java.dir.junit}/**/Test*SWT*AWT*"/>
                 <exclude name="**/*$$*"/>
-                <exclude name="**/Test*SWTHeadless*"/>
             </fileset>
           <sequential>
             <var name="test.class.path" unset="true"/>
@@ -611,7 +612,6 @@
                 <arg line="${junit.run.arg0}"/>
                 <arg line="${junit.run.arg1}"/>
                 <arg line="${jvmDataModel.arg}"/>
-                <arg line="${jvmarg.mainthrd}"/>
                 <arg value="-Djava.library.path=${obj.all.paths}"/>
                 <!--
                 <arg line="-Dnewt.debug.EDT"/>
-- 
cgit v1.2.3