[tor-commits] [collector/master] cobertura.ser needs to be in basedir in order to calculate coverage correctly.

[karsten at torproject.org]

commit 79653eb97741b8a65a12ad42d59760a93aab5946
Author: iwakeh <iwakeh at torproject.org>
Date:   Thu May 19 17:23:21 2016 +0200

    cobertura.ser needs to be in basedir in order to calculate coverage correctly.
---
 build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 14223a9..2acaa26 100644
--- a/build.xml
+++ b/build.xml
@@ -15,7 +15,7 @@
   <property name="testclasses" value="${generated}/testclasses/"/>
   <property name="docs" value="${generated}/javadoc/"/>
   <property name="libs" value="lib"/>
-  <property name="cobertura.ser.file" value="${generated}/cobertura.ser" />
+  <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" />
   <property name="jarfile" value="collector-${release.version}.jar" />
   <property name="jarsourcesfile" value="collector-${release.version}-sources.jar" />
   <property name="jarjavadocfile" value="collector-${release.version}-javadoc.jar" />
@@ -71,6 +71,7 @@
     <delete includeEmptyDirs="true" quiet="true">
       <fileset dir="${generated}" defaultexcludes="false" includes="**" />
     </delete>
+    <delete file="${cobertura.ser.file}" quiet="true"/>
     <delete file="${jarfile}" quiet="true"/>
     <delete file="${jarsourcesfile}" quiet="true"/>
     <delete file="${jarjavadocfile}" quiet="true"/>
@@ -179,7 +180,7 @@
     </cobertura-instrument>
     <junit fork="true" haltonfailure="false" printsummary="on">
       <sysproperty key="net.sourceforge.cobertura.datafile"
-                   file="${basedir}/${cobertura.ser.file}" />
+                   file="${cobertura.ser.file}" />
       <classpath location="${instrument}" />
       <classpath refid="classpath" />
       <classpath refid="test.classpath" />