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

Allow overriding w32.ascii when running test suite #1231

Merged
merged 1 commit into from
Jul 15, 2020
Merged

Allow overriding w32.ascii when running test suite #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Next Release (5.7.0)

Features
--------
* [#1231](https://github.com/java-native-access/jna/pull/1231): The test suite can now be executed on Windows using either ANSI or UNICODE win32 API by passing `-Dw32.ascii=true/false` to ant. Previously, UNICODE was always used. - [@T-Svensson](https://github.com/T-Svensson/)

Bug Fixes
---------
Expand Down
5 changes: 5 additions & 0 deletions contrib/platform/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,18 @@ com.sun.jna.platform.wince;version=${osgi.version}
<echo>tests.platform.windows=${tests.platform.windows}</echo>
<echo>tests.platform.linux=${tests.platform.linux}</echo>
<echo>tests.platform.unix=${tests.platform.unix}</echo>
<propertyset id="native.api.windows">
<propertyref name="w32.ascii"/>
</propertyset>
<junit fork="${test.fork}" failureproperty="testfailure" tempdir="${build.dir}">
<!-- optionally run headless -->
<syspropertyset refid="headless"/>
<!-- avoid VM conflicts with JNA protected mode -->
<env key="${ld.preload.name}" file="${libjsig}"/>
<!-- Ignore any system install of JNA -->
<sysproperty key="jna.builddir" file="${file.reference.jna.build}"/>
<!-- Optionally force native API on Windows -->
<syspropertyset refid="native.api.windows"/>
<jvmarg value="${vmopt.arch}"/>
<classpath><path path="${run.test.classpath}"/><path path="${file.reference.jna.build}/test-classes"/></classpath>
<formatter type="brief" usefile="false"/>
Expand Down