mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-02 06:45:59 +01:00
SMACK-286 Fixed ant test-unit target to work with configuration changes
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13873 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
1c5b28cf9f
commit
fb6dbda30f
1 changed files with 8 additions and 5 deletions
|
@ -288,17 +288,20 @@
|
||||||
<!-- jar -->
|
<!-- jar -->
|
||||||
<!-- ======================================================================================= -->
|
<!-- ======================================================================================= -->
|
||||||
<target name="jar-test" depends="compile-test" description="Produces jar of test code">
|
<target name="jar-test" depends="compile-test" description="Produces jar of test code">
|
||||||
|
<copy todir="${compile.test.dir}/META-INF" file="${basedir}/build/resources/META-INF/jul.properties" />
|
||||||
|
<copy todir="${compile.test.dir}/META-INF" file="${basedir}/build/resources/META-INF/smack-config.xml" />
|
||||||
|
<copy todir="${compile.test.dir}/META-INF" file="${basedir}/build/resources/META-INF/core.providers" />
|
||||||
<jar destfile="${jar.dest.dir}/smack-test.jar"
|
<jar destfile="${jar.dest.dir}/smack-test.jar"
|
||||||
basedir="${compile.test.dir}"
|
basedir="${compile.test.dir}"
|
||||||
includes="org/jivesoftware/smack/**/*.class"
|
includes="org/jivesoftware/smack/**/*.class, **/smack-config.xml, **/core.providers, **/jul.properties"
|
||||||
/>
|
/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="jar-test-smackx" depends="compile-test" description="Produces jar of test code">
|
<target name="jar-test-smackx" depends="compile-test" description="Produces jar of test code">
|
||||||
|
<copy todir="${compile.test.dir}/META-INF" file="${basedir}/build/resources/META-INF/extension.providers" />
|
||||||
<jar destfile="${jar.dest.dir}/smack-test-smackx.jar"
|
<jar destfile="${jar.dest.dir}/smack-test-smackx.jar"
|
||||||
basedir="${compile.test.dir}"
|
basedir="${compile.test.dir}"
|
||||||
includes="org/jivesoftware/smackx/**/*.class
|
includes="org/jivesoftware/smackx/**/*.class, org/jivesoftware/util/**/*.class, **/extension.providers"
|
||||||
org/jivesoftware/util/**/*.class"
|
|
||||||
/>
|
/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
@ -410,7 +413,7 @@
|
||||||
<!-- ======================================================================================= -->
|
<!-- ======================================================================================= -->
|
||||||
<target name="test-unit" depends="compile, jar-test, jar-test-smackx" unless="no.test">
|
<target name="test-unit" depends="compile, jar-test, jar-test-smackx" unless="no.test">
|
||||||
<junit printsummary="on"
|
<junit printsummary="on"
|
||||||
fork="true"
|
fork="false"
|
||||||
haltonfailure="false"
|
haltonfailure="false"
|
||||||
failureproperty="tests.failed"
|
failureproperty="tests.failed"
|
||||||
showoutput="true">
|
showoutput="true">
|
||||||
|
@ -430,7 +433,7 @@
|
||||||
</fileset>
|
</fileset>
|
||||||
<fileset dir="${jar.dest.dir}">
|
<fileset dir="${jar.dest.dir}">
|
||||||
<include name="smack-test.jar"/>
|
<include name="smack-test.jar"/>
|
||||||
<include name="smack-test-smackx.jar" />
|
<include name="smack-test-smackx.jar" />
|
||||||
</fileset>
|
</fileset>
|
||||||
<pathelement location="${compile.dir}" />
|
<pathelement location="${compile.dir}" />
|
||||||
<pathelement location="${test-unit.dir}" />
|
<pathelement location="${test-unit.dir}" />
|
||||||
|
|
Loading…
Reference in a new issue