mirror of
https://github.com/angryip/ipscan.git
synced 2025-10-26 11:18:17 +00:00
test build.xml fixed, local junit4 added to ext
git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk@80 375186e5-ef17-0410-b0b6-91563547dcda
This commit is contained in:
parent
e8ec90c1c6
commit
03ee1785f6
@ -4,11 +4,14 @@
|
||||
<property name="dist" value="dist"/>
|
||||
<property name="ext" value="ext"/>
|
||||
<property name="src" value="src"/>
|
||||
<property name="classes-to-test" value="../ipscan/bin"/>
|
||||
<property name="testresults" value="testresults"/>
|
||||
|
||||
<property name="swt" value="../swt"/>
|
||||
<property name="emma.dir" value="${ext}/emma"/>
|
||||
|
||||
<path id="test.path" path="bin"/>
|
||||
|
||||
<path id="emma.lib">
|
||||
<pathelement location="${emma.dir}/emma.jar" />
|
||||
<pathelement location="${emma.dir}/emma_ant.jar" />
|
||||
@ -20,7 +23,7 @@
|
||||
<exclude name="**/*.java"/>
|
||||
</patternset>
|
||||
|
||||
<target name="test" depends="cleanup,compile-tests,do_test,cleanup_end"/>
|
||||
<target name="test" depends="cleanup,compile-tests,do-test,cleanup_end"/>
|
||||
|
||||
<target name="cleanup">
|
||||
<delete dir="bin"/>
|
||||
@ -33,18 +36,14 @@
|
||||
|
||||
<macrodef name="compile">
|
||||
<attribute name="path"/>
|
||||
<attribute name="dest" default="@{path}"/>
|
||||
<attribute name="extpath" default=""/>
|
||||
<attribute name="debug" default="false"/>
|
||||
<attribute name="optimize" default="true"/>
|
||||
<sequential>
|
||||
<mkdir dir="bin"/>
|
||||
<javac destdir="bin" debug="@{debug}" source="1.5" target="1.5">
|
||||
<javac destdir="bin" source="1.5" target="1.5">
|
||||
<src path="@{path}"/>
|
||||
<src path="@{extpath}"/>
|
||||
<classpath>
|
||||
<fileset dir="${ext}" includes="**/*.jar"/>
|
||||
<fileset dir="${swt}" includes="*.jar"/>
|
||||
<path path="${classes-to-test}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="bin">
|
||||
@ -52,16 +51,11 @@
|
||||
<patternset refid="classpath.resources"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="bin">
|
||||
<fileset dir="${resources}">
|
||||
<patternset refid="classpath.resources"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
<target name="compile-tests">
|
||||
<compile path="${src}" dest="${test}" extpath="${ext.src}" debug="true"/>
|
||||
<compile path="${src}"/>
|
||||
<emma>
|
||||
<instr instrpathref="test.path" destdir="bin.instr" metadatafile="${testresults}/metadata.emma" merge="false" filter="net.azib.ipscan.*"/>
|
||||
</emma>
|
||||
@ -69,10 +63,9 @@
|
||||
<fileset dir="bin.instr" includes="**/*.class"/>
|
||||
</copy>
|
||||
<delete dir="bin.instr"/>
|
||||
<compile path="${test}" dest="${test}" debug="true"/>
|
||||
</target>
|
||||
|
||||
<target name="do_test">
|
||||
<target name="do-test">
|
||||
<delete dir="${testresults}"/>
|
||||
<mkdir dir="${testresults}"/>
|
||||
<delete file="coverage.ec"/>
|
||||
|
||||
BIN
ipscan-unittest/ext/junit/junit-4.1.jar
Executable file
BIN
ipscan-unittest/ext/junit/junit-4.1.jar
Executable file
Binary file not shown.
Loading…
Reference in New Issue
Block a user