From d3c3d69ded58e325287746635d614fc5db43594a Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 18 Oct 2011 20:08:04 +0200
Subject: Exclude SWT tests on platforms w/o SWT runtime

---
 make/build-common.xml | 17 +++++++++++++++--
 make/build-test.xml   |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'make')

diff --git a/make/build-common.xml b/make/build-common.xml
index 58a829fc6..aceece32d 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -164,16 +164,29 @@
           <istrue value="${isSolarisX86}" />
         </condition>
         <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt-debug.jar">
-          <istrue value="${isSolarisAMD64}" />
+          <istrue value="${isSolarisAMD64}" /> <!-- FIXME JAU .. hack -->
         </condition>
         <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
           <istrue value="${isSolarisSparc}" />
         </condition>
 		<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt-debug.jar">
-          <istrue value="${isSolarisSparcv9}" />
+          <istrue value="${isSolarisSparcv9}" /> <!-- FIXME JAU .. hack -->
         </condition>
         <echo message="swt.jar=${swt.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>
+        </condition>
+        <echo message="isSWTRuntimeAvailable=${isSWTRuntimeAvailable}" />
+
         <property name="target.sourcelevel" value="1.5" />
         <property name="host.sourcelevel"   value="1.5" />
 
diff --git a/make/build-test.xml b/make/build-test.xml
index feb9ae834..5f975d8e1 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -342,7 +342,7 @@
         </junit>
     </target>
 
-    <target name="junit.run.swt.headless" depends="test.compile" description="Runs all pure SWT tests.">
+    <target name="junit.run.swt.headless" depends="test.compile" description="Runs all pure SWT tests." if="isSWTRuntimeAvailable">
         <!-- Test*SWT* 
 
              Emulation of junit task.
@@ -406,7 +406,7 @@
     </target>
 
     <!-- currently freezes OSX -->
-    <target name="junit.run.swt.awt" depends="test.compile" description="Runs all SWT_AWT tests." unless="isOSX">
+    <target name="junit.run.swt.awt" depends="test.compile" description="Runs all SWT_AWT tests." if="isSWTRuntimeAvailable" unless="isOSX">
       <!-- Test*SWT* -->
       <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
           <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-- 
cgit v1.2.3