Commit b3d81843 authored by Guus der Kinderen's avatar Guus der Kinderen

Do not depend on platform-provided junit integration for Ant.

When executing junit, Openfire used to depend on the Ant/JUnit integration
as provided in the home directory of ant. This leads to platform-specific
build results. By providing the ant/junit libraries, this effect is reduced.
parent 46004515
...@@ -142,6 +142,9 @@ ...@@ -142,6 +142,9 @@
<taskdef name="propertymerge" classname="org.jugbb.ant.propertymerge.PropertyMergeTask"> <taskdef name="propertymerge" classname="org.jugbb.ant.propertymerge.PropertyMergeTask">
<classpath refid="ant.dependencies" /> <classpath refid="ant.dependencies" />
</taskdef> </taskdef>
<taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
<classpath refid="ant.dependencies" />
</taskdef>
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<!-- PATHs / PATTERNSETs / FILTERSETs --> <!-- PATHs / PATTERNSETs / FILTERSETs -->
...@@ -657,7 +660,7 @@ ...@@ -657,7 +660,7 @@
<!-- Run jUnit --> <!-- Run jUnit -->
<mkdir dir="${test.results.dest.dir}"/> <mkdir dir="${test.results.dest.dir}"/>
<junit printsummary="yes" haltonfailure="yes" fork="yes" dir="${test.dest.dir}"> <junit printsummary="yes" haltonfailure="yes" fork="yes" dir="${test.dest.dir}" includeantruntime="false">
<sysproperty key="openfireHome" value="${target.openfireHome}"/> <sysproperty key="openfireHome" value="${target.openfireHome}"/>
<!-- We must add our own classes to the classpath for testing --> <!-- We must add our own classes to the classpath for testing -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment