sigar.jar version needs ANT_OPTS too
This commit is contained in:
parent
efcc9971c3
commit
84e88b24e1
|
@ -356,19 +356,6 @@
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="xtest" depends="jni-init">
|
<target name="xtest" depends="jni-init">
|
||||||
<property name="testresults"
|
|
||||||
location="${build}/testresults/${jni.libarch}"/>
|
|
||||||
|
|
||||||
<mkdir dir="${testresults}"/>
|
|
||||||
|
|
||||||
<!-- test/capture sigar.jar version -->
|
|
||||||
<java fork="yes" failonerror="yes"
|
|
||||||
output="${testresults}/version.txt"
|
|
||||||
jvm="${java.home}/bin/java"
|
|
||||||
jar="${sigar-bin}/lib/${sigar.jar}">
|
|
||||||
<arg value="version"/>
|
|
||||||
</java>
|
|
||||||
|
|
||||||
<condition property="win32.test" value="win32/test">
|
<condition property="win32.test" value="win32/test">
|
||||||
<os family="windows"/>
|
<os family="windows"/>
|
||||||
</condition>
|
</condition>
|
||||||
|
@ -382,6 +369,20 @@
|
||||||
</not>
|
</not>
|
||||||
</condition>
|
</condition>
|
||||||
|
|
||||||
|
<property name="testresults"
|
||||||
|
location="${build}/testresults/${jni.libarch}"/>
|
||||||
|
|
||||||
|
<mkdir dir="${testresults}"/>
|
||||||
|
|
||||||
|
<!-- test/capture sigar.jar version -->
|
||||||
|
<java fork="yes" failonerror="yes"
|
||||||
|
output="${testresults}/version.txt"
|
||||||
|
jvm="${java.home}/bin/java"
|
||||||
|
jvmargs="${junit.args}"
|
||||||
|
jar="${sigar-bin}/lib/${sigar.jar}">
|
||||||
|
<arg value="version"/>
|
||||||
|
</java>
|
||||||
|
|
||||||
<junit printsummary="yes" fork="yes"
|
<junit printsummary="yes" fork="yes"
|
||||||
haltonfailure="yes" showoutput="true">
|
haltonfailure="yes" showoutput="true">
|
||||||
<jvmarg line="${junit.args}"/>
|
<jvmarg line="${junit.args}"/>
|
||||||
|
|
Loading…
Reference in New Issue