Don't run unix tests on mac

Author: dbwiddis

build.xml

@@ -241,11 +241,11 @@
     </condition>
     <condition property="jre.arch" value="ppc64le">
       <or>
-	<matches pattern="(powerpc64le|power64le|ppc64le)" string="${build.os.arch}"/>
-	<and>
-	  <matches pattern="(powerpc64|power64|ppc64)" string="${build.os.arch}"/>
-	  <matches pattern="little" string="${build.os.endianess}"/>
-	</and>
+    <matches pattern="(powerpc64le|power64le|ppc64le)" string="${build.os.arch}"/>
+    <and>
+      <matches pattern="(powerpc64|power64|ppc64)" string="${build.os.arch}"/>
+      <matches pattern="little" string="${build.os.endianess}"/>
+    </and>
       </or>
     </condition>
     <condition property="jre.arch" value="ppc64">
@@ -280,7 +280,7 @@
       <equals arg1="${build.os.name}" arg2="FreeBSD"/>
     </condition>
     <condition property="os.prefix" value="openbsd-${jre.arch}">
-	<equals arg1="${build.os.name}" arg2="OpenBSD"/>
+    <equals arg1="${build.os.name}" arg2="OpenBSD"/>
     </condition>
     <condition property="os.prefix" value="netbsd-${jre.arch}">
       <equals arg1="${build.os.name}" arg2="NetBSD"/>
@@ -685,15 +685,15 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     <fixcrlf file="${md5.file}" eol="unix"/>
     <replaceregexp match="^((.*\.h):JNIEXPORT[^(]+)( +\(.*)"
                    replace="\1&#xa;\2- \3&#xa;--"
-		   byline="true"
+           byline="true"
                    file="${md5.file}"/>
     <replaceregexp match="(JNIEnv *\*) *env"
                    replace="\1"
-		   byline="true"
+           byline="true"
                    file="${md5.file}"/>
     <replaceregexp match="&#xa;--&#xa;.*\.h-$"
                    replace=""
-		   flags="m"
+           flags="m"
                    file="${md5.file}"/>
     <checksum property="md5" file="${md5.file}" />
     <propertyfile file="${jni.info}">
@@ -844,42 +844,42 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     </condition>
     <property name="xcode" value="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform"/>
     <condition property="make.SDKROOT"
-	       value="SDKROOT=${xcode}/Developer/SDKs/MacOSX10.11.sdk">
+           value="SDKROOT=${xcode}/Developer/SDKs/MacOSX10.11.sdk">
       <and>
         <equals arg1="${os.prefix}" arg2="darwin" trim="true"/>
         <available file="${xcode}/Developer/SDKs/MacOSX10.11.sdk"/>
       </and>
     </condition>
     <condition property="make.SDKROOT"
-	       value="SDKROOT=${xcode}/Developer/SDKs/MacOSX10.9.sdk">
+           value="SDKROOT=${xcode}/Developer/SDKs/MacOSX10.9.sdk">
       <and>
         <equals arg1="${os.prefix}" arg2="darwin" trim="true"/>
         <available file="${xcode}/Developer/SDKs/MacOSX10.9.sdk"/>
       </and>
     </condition>
     <condition property="make.SDKROOT"
-	       value="SDKROOT=${xcode}/Developer/SDKs/MacOSX10.8.sdk">
+           value="SDKROOT=${xcode}/Developer/SDKs/MacOSX10.8.sdk">
       <and>
         <equals arg1="${os.prefix}" arg2="darwin" trim="true"/>
         <available file="${xcode}/Developer/SDKs/MacOSX10.8.sdk"/>
       </and>
     </condition>
     <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.6.sdk">
+           value="SDKROOT=/Developer/SDKs/MacOSX10.6.sdk">
       <and>
         <equals arg1="${os.prefix}" arg2="darwin" trim="true"/>
         <available file="/Developer/SDKs/MacOSX10.6.sdk"/>
       </and>
     </condition>
     <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.5.sdk">
+           value="SDKROOT=/Developer/SDKs/MacOSX10.5.sdk">
       <and>
         <equals arg1="${os.prefix}" arg2="darwin" trim="true"/>
         <available file="/Developer/SDKs/MacOSX10.5.sdk"/>
       </and>
     </condition>
     <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk" else="IGNORE=">
+           value="SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk" else="IGNORE=">
       <and>
         <equals arg1="${os.prefix}" arg2="darwin" trim="true"/>
         <available file="/Developer/SDKs/MacOSX10.4u.sdk"/>
@@ -1041,7 +1041,7 @@ cd ..
   </target>
 
   <target name="compile-tests" depends="compile,native,jar"
-  	description="Compile all test code">
+      description="Compile all test code">
     <javac classpathref="compile-test.path"
            source="${test.compatibility}"
            target="${test.compatibility}"
@@ -1175,10 +1175,7 @@ cd ..
       <os family="mac"/>
     </condition>
     <condition property="tests.platform" value="**/unix/**/*Test.java">
-      <and>
-        <os family="unix"/>
-        <not><os family="mac"/></not>
-      </and>
+      <and><os family="unix"/><not><os family="mac"/></not></and>
     </condition>
     <property name="tests.platform" value=""/>
     <property name="tests.include" value="com/sun/jna/*Test.java"/>
@@ -1324,7 +1321,7 @@ cd ..
     </copy>
     <copy todir="${dist}/jnacontrib" flatten="true">
       <fileset dir="${contrib}">
-	<include name="**/build/demo-*.jar" />
+    <include name="**/build/demo-*.jar" />
       </fileset>
     </copy>
     <jar jarfile="${maven-javadoc-jar}">

contrib/platform/build.xml

@@ -179,7 +179,10 @@ com.sun.jna.platform.wince;version=${osgi.version}
         <os name="Linux"/>
       </condition>
       <condition property="tests.platform.unix" value="**/unix/**/*Test.java">
-        <os family="unix"/>
+	<and>
+          <os family="unix"/>
+          <not><os family="mac"/></not>
+        </and>
       </condition>
       <property name="tests.platform.mac" value=""/>
       <property name="tests.platform.windows" value=""/>