Merge pull request #541 from java-native-access/w32api-cleanup

Clean up w32 platform-specific tests
java-native-access · Nov 22, 2015 · f3a25d9 · f3a25d9
2 parents 85a7bad + 8003775
commit f3a25d9
Show file tree

Hide file tree

Showing 56 changed files with 510 additions and 474 deletions.
diff --git a/build.xml b/build.xml
@@ -307,6 +307,7 @@
       <path id="test.libs">
         <fileset dir="lib">
           <include name="junit.jar"/>
+          <include name="hamcrest-core-1.3.jar"/>
         </fileset>
         <fileset dir="lib/test"/>
         <pathelement path="${classes}"/>
@@ -520,7 +521,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     <subant target="jar" failonerror="true">
       <property name="file.reference.jna.build" location="${build}"/>
       <property name="file.reference.jna.jar" location="${build}/${jar}"/>
-      <property name="libs.junit.classpath" location="lib/junit.jar"/>
+      <property name="libs.junit.classpath" refid="test.libs"/>
       <property name="javac.source" value="${platform.compatibility}"/>
       <property name="javac.target" value="${platform.compatibility}"/>
       <!-- OSGi manifest properties -->
@@ -543,7 +544,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     <subant target="jar" failonerror="true">
       <property name="file.reference.jna.build" location="${build}"/>
       <property name="file.reference.jna.jar" location="${build}/${jar}"/>
-      <property name="libs.junit.classpath" location="lib/junit.jar"/>
+      <property name="libs.junit.classpath" refid="test.libs"/>
       <fileset dir="${contrib}" includes="*/build.xml" excludes="platform/build.xml"/>
     </subant>
   </target>
@@ -971,7 +972,10 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     <condition property="tests.exclude" value="${tests.stdcall}">
       <and><os family="windows"/><not><os arch="x86"/></not></and>
     </condition>
-    <condition property="tests.platform" value="**/unix/*Test.java">
+    <condition property="tests.platform" value="**/mac/**/*Test.java">
+      <os family="mac"/>
+    </condition>
+    <condition property="tests.platform" value="**/unix/**/*Test.java">
       <and>
         <os family="unix"/>
         <not><os family="mac"/></not>
@@ -1025,7 +1029,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     <subant target="test" failonerror="true" inheritall="true" inheritrefs="true">
       <property name="file.reference.jna.build" location="${build}"/>
       <property name="file.reference.jna.jar" location="${build}/${jar}"/>
-      <property name="libs.junit.classpath" location="lib/junit.jar"/>
+      <property name="libs.junit.classpath" refid="test.libs"/>
       <property name="javac.source" value="${test.compatibility}"/>
       <property name="javac.target" value="${test.compatibility}"/>
       <fileset dir="${contrib}" includes="platform/build.xml"/>

diff --git a/contrib/platform/build.xml b/contrib/platform/build.xml
@@ -111,13 +111,13 @@ com.sun.jna.platform.wince
       <property name="build.test.results.dir.abs" location="${build.test.results.dir}"/>
       <mkdir dir="${build.test.results.dir.abs}"/>
       <echo>Saving test results in ${build.test.results.dir.abs}</echo>
-      <condition property="tests.platform" value="**/mac/**">
+      <condition property="tests.platform" value="**/mac/**/*Test.java">
         <os family="mac"/>
       </condition>
-      <condition property="tests.platform" value="**/win32/**">
+      <condition property="tests.platform" value="**/win32/**/*Test.java">
         <os family="windows"/>
       </condition>
-      <condition property="tests.platform" value="**/unix/**">
+      <condition property="tests.platform" value="**/unix/**/*Test.java">
         <os family="unix"/>
       </condition>
       <property name="tests.platform" value=""/>
@@ -155,7 +155,7 @@ com.sun.jna.platform.wince
           <fileset dir="${test.src.dir}" excludes="${tests.exclude-patterns}">
             <!-- Until StructureFieldOrderTest gets fixed up a little -->
             <exclude name="**/StructureFieldOrderTest.java"/>
-            <include name="com/sun/jna/platform/*Test.java"/>
+            <exclude name="com/sun/jna/platform/AbstractWin32TestSupport.java"/>
             <include name="${tests.platform}"/>
             <exclude name="${tests.exclude}"/>
           </fileset>