Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up w32 platform-specific tests #541

Merged
merged 4 commits into from
Nov 22, 2015
+510 −474
Merged

Clean up w32 platform-specific tests #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54aa55f
Drop StdCallLibrary inheritance from non-library interfaces
twall Nov 22, 2015
5355187
fix mappings to properly work on 32-bit windows (fixes memory faults)
twall Nov 22, 2015
7771d8a
Ensure COM tests are run as part of w32 platform tests
twall Nov 22, 2015
8003775
use proper type sizes
twall Nov 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand Down Expand Up @@ -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 -->
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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"/>
Expand Down
8 changes: 4 additions & 4 deletions contrib/platform/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=""/>
Expand Down Expand Up @@ -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>
Expand Down
Loading