Repository: cassandra Updated Branches: refs/heads/trunk fca83d812 -> b14423c8b
Allow jacoco report merging patch by Russ Hatch; reviewed by Philip Thompson and Ariel Weisberg for CASSANDRA-10616 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b14423c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b14423c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b14423c8 Branch: refs/heads/trunk Commit: b14423c8b4c26f3ac84c901ff078d7635aaddfb8 Parents: fca83d8 Author: Russ Hatch <russtheha...@gmail.com> Authored: Tue Oct 27 15:19:12 2015 -0600 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Nov 4 13:07:02 2015 +0000 ---------------------------------------------------------------------- build.xml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b14423c8/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 57a4e4f..a7296e1 100644 --- a/build.xml +++ b/build.xml @@ -112,8 +112,10 @@ <!-- http://www.eclemma.org/jacoco/ --> <property name="jacoco.export.dir" value="${build.dir}/jacoco/" /> - <property name="jacoco.execfile" value="${jacoco.export.dir}/jacoco.exec" /> - <property name="jacoco.version" value="0.7.1.201405082137"/> + <property name="jacoco.partials.dir" value="${jacoco.export.dir}/partials" /> + <property name="jacoco.partialexecfile" value="${jacoco.partials.dir}/partial.exec" /> + <property name="jacoco.finalexecfile" value="${jacoco.export.dir}/jacoco.exec" /> + <property name="jacoco.version" value="0.7.5.201505241946"/> <property name="ecj.version" value="4.4.2"/> @@ -196,6 +198,7 @@ <mkdir dir="${build.src.gen-java}"/> <mkdir dir="${build.dir.lib}"/> <mkdir dir="${jacoco.export.dir}"/> + <mkdir dir="${jacoco.partials.dir}"/> </target> <target name="clean" description="Remove all locally created artifacts"> @@ -205,6 +208,7 @@ <delete dir="${build.src.gen-java}" /> <delete dir="${version.properties.dir}" /> <delete dir="${jacoco.export.dir}" /> + <delete dir="${jacoco.partials.dir}"/> </target> <target depends="clean" name="cleanall"/> @@ -1160,7 +1164,7 @@ <sequential> <condition property="additionalagent" - value="-javaagent:${build.dir.lib}/jars/jacocoagent.jar=destfile=${jacoco.execfile}" + value="-javaagent:${build.dir.lib}/jars/jacocoagent.jar=destfile=${jacoco.partialexecfile}" else=""> <istrue value="${usejacoco}"/> </condition> @@ -1463,10 +1467,16 @@ <typedef uri="antlib:org.jacoco.ant" classpathref="jacocoant.classpath"/> </target> - <target name="jacoco-report" depends="jacoco-init"> + <target name="jacoco-merge" depends="jacoco-init"> + <jacoco:merge destfile="${jacoco.finalexecfile}" xmlns:jacoco="antlib:org.jacoco.ant"> + <fileset dir="${jacoco.export.dir}" includes="*.exec,**/*.exec"/> + </jacoco:merge> + </target> + + <target name="jacoco-report" depends="jacoco-merge"> <jacoco:report xmlns:jacoco="antlib:org.jacoco.ant"> <executiondata> - <file file="${jacoco.execfile}" /> + <file file="${jacoco.finalexecfile}" /> </executiondata> <structure name="JaCoCo Cassandara Coverage Report"> <classfiles> @@ -1489,7 +1499,7 @@ </target> <target name="jacoco-cleanup" description="Destroy JaCoCo exec data and reports"> - <delete file="${jacoco.execfile}"/> + <delete file="${jacoco.partialexecfile}"/> <delete dir="${jacoco.export.dir}"/> </target>
