sadie/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shuffled build targets around to group together ones related to unit tests

Browse Source
This commit is contained in:
str4d
2012-02-16 00:08:27 +00:00
parent a3597e45fa
commit 8a32aad6c3
3 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build.xml
View File

@@ -980,12 +980,6 @@
</exec> </exec>
</target> </target>
<target name="updateTest" depends="prepupdate">
<ant dir="core/java/" target="jarTest" />
<copy file="core/java/build/i2ptest.jar" todir="pkg-temp/lib" />
<zip destfile="i2pupdate.zip" basedir="pkg-temp" />
</target>
<!-- script translation added in 0.8.13, so don't need updates until .14, but put it in now so we don't forget --> <!-- script translation added in 0.8.13, so don't need updates until .14, but put it in now so we don't forget -->
<target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates, prep-script-translation"> <target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates, prep-script-translation">
<copy file="build/BOB.jar" todir="pkg-temp/lib/" /> <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
@@ -1245,6 +1239,12 @@
</target> </target>
<!-- end custom installers --> <!-- end custom installers -->
<!-- unit tests -->
<target name="updateTest" depends="prepupdate">
<ant dir="core/java/" target="jarTest" />
<copy file="core/java/build/i2ptest.jar" todir="pkg-temp/lib" />
<zip destfile="i2pupdate.zip" basedir="pkg-temp" />
</target>
<target name="test" depends="buildProperties, jbigi" > <target name="test" depends="buildProperties, jbigi" >
<mkdir dir="reports/core/junit/" /> <mkdir dir="reports/core/junit/" />
<ant dir="core/java/" target="test" /> <ant dir="core/java/" target="test" />
@@ -1264,6 +1264,7 @@
<ant dir="core/java/" target="fullclovertest" /> <ant dir="core/java/" target="fullclovertest" />
<ant dir="router/java/" target="fullclovertest" /> <ant dir="router/java/" target="fullclovertest" />
</target> </target>
<!-- end unit tests -->
<target name="testscripts" > <target name="testscripts" >
<exec executable="tests/scripts/checkcerts.sh" failonerror="true" /> <exec executable="tests/scripts/checkcerts.sh" failonerror="true" />

31
core/java/build.xml
View File

@@ -28,17 +28,6 @@
</javac> </javac>
</target> </target>
<target name="compileTest">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<!-- junit classes are in ant runtime -->
<javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
includeAntRuntime="true"
destdir="./build/obj" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
<target name="listChangedFiles" if="mtn.available" > <target name="listChangedFiles" if="mtn.available" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="list" />
@@ -72,14 +61,26 @@
</uptodate> </uptodate>
</target> </target>
<target name="jarTest" depends="compileTest">
<jar destfile="./build/i2ptest.jar" basedir="./build/obj" includes="**/*.class" />
</target>
<target name="javadoc"> <target name="javadoc">
<mkdir dir="./build" /> <mkdir dir="./build" />
<mkdir dir="./build/javadoc" /> <mkdir dir="./build/javadoc" />
<javadoc sourcepath="./src:./test" destdir="./build/javadoc" packagenames="*" use="true" splitindex="true" windowtitle="I2P SDK" /> <javadoc sourcepath="./src:./test" destdir="./build/javadoc" packagenames="*" use="true" splitindex="true" windowtitle="I2P SDK" />
</target> </target>
<!-- unit tests -->
<target name="compileTest">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<!-- junit classes are in ant runtime -->
<javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
includeAntRuntime="true"
destdir="./build/obj" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
<target name="jarTest" depends="compileTest">
<jar destfile="./build/i2ptest.jar" basedir="./build/obj" includes="**/*.class" />
</target>
<target name="prepareTest" depends="compileTest" if="with.cobertura"> <target name="prepareTest" depends="compileTest" if="with.cobertura">
<taskdef classpath="${with.cobertura}" resource="tasks.properties" onerror="report" /> <taskdef classpath="${with.cobertura}" resource="tasks.properties" onerror="report" />
<mkdir dir="./build/obj_test" /> <mkdir dir="./build/obj_test" />
@@ -133,6 +134,8 @@
</target> </target>
<target name="test.report" depends="junit.report"/> <target name="test.report" depends="junit.report"/>
<target name="fulltest" depends="test, junit.report" /> <target name="fulltest" depends="test, junit.report" />
<!-- end unit tests -->
<target name="clean"> <target name="clean">
<delete dir="./build" /> <delete dir="./build" />
</target> </target>

37
router/java/build.xml
View File

@@ -5,9 +5,6 @@
<target name="builddep"> <target name="builddep">
<!-- run from top level build.xml to get dependencies built --> <!-- run from top level build.xml to get dependencies built -->
</target> </target>
<target name="builddeptest">
<ant dir="../../core/java/" target="jarTest" />
</target>
<condition property="depend.available"> <condition property="depend.available">
<typefound name="depend" /> <typefound name="depend" />
</condition> </condition>
@@ -42,17 +39,6 @@
</javac> </javac>
</target> </target>
<target name="compileTest" depends="builddeptest">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<!-- junit classes are in ant runtime -->
<javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
includeAntRuntime="true"
destdir="./build/obj" classpath="../../core/java/build/i2ptest.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
<target name="listChangedFiles" if="mtn.available" > <target name="listChangedFiles" if="mtn.available" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="list" />
@@ -86,9 +72,6 @@
</uptodate> </uptodate>
</target> </target>
<target name="jarTest" depends="compileTest">
<jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
</target>
<target name="javadoc"> <target name="javadoc">
<mkdir dir="./build" /> <mkdir dir="./build" />
<mkdir dir="./build/javadoc" /> <mkdir dir="./build/javadoc" />
@@ -99,6 +82,24 @@
splitindex="true" splitindex="true"
windowtitle="I2P Router" /> windowtitle="I2P Router" />
</target> </target>
<!-- unit tests -->
<target name="builddeptest">
<ant dir="../../core/java/" target="jarTest" />
</target>
<target name="compileTest" depends="builddeptest">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<!-- junit classes are in ant runtime -->
<javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
includeAntRuntime="true"
destdir="./build/obj" classpath="../../core/java/build/i2ptest.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
<target name="jarTest" depends="compileTest">
<jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
</target>
<target name="test" depends="compileTest"> <target name="test" depends="compileTest">
<junit printsummary="on" fork="yes"> <junit printsummary="on" fork="yes">
<classpath> <classpath>
@@ -164,6 +165,8 @@
</target> </target>
<target name="fulltest" depends="cleandep, builddeptest, jarTest, test, junit.report" /> <target name="fulltest" depends="cleandep, builddeptest, jarTest, test, junit.report" />
<target name="fullclovertest" depends="cleandep, builddeptest, useclover, jarTest, test, test.report" /> <target name="fullclovertest" depends="cleandep, builddeptest, useclover, jarTest, test, test.report" />
<!-- end unit tests -->
<target name="clean"> <target name="clean">
<delete dir="./build" /> <delete dir="./build" />
</target> </target>