Merge pull request #1231 from T-Svensson/iso/allow-override-w32.ascii…

…-from-and-cmdline

Allow overriding w32.ascii when running test suite

CHANGES.md

@@ -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
 ---------

contrib/platform/build.xml

@@ -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"/>