summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2011-04-05 09:27:33 +0000
committerRobert Gemmell <robbie@apache.org>2011-04-05 09:27:33 +0000
commit1416572d5472bf5b8ac5566711f97477d4dc3510 (patch)
tree30a2f51e51c9aa652b053c2a054c4d3c16e6b823
parent45beb387a33288179512317eab6095f292615451 (diff)
downloadqpid-python-0.5.x-dev.tar.gz
QPID-3184: amend ant build to produce coverage.xml0.5.x-dev
Applied patch from Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5.x-dev@1088936 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/build.xml13
-rw-r--r--qpid/java/module.xml3
2 files changed, 12 insertions, 4 deletions
diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index b91b903395..8391dc001c 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -205,7 +205,18 @@
<include name="**/*.ser"/>
</fileset>
</cobertura-merge>
- <cobertura-report format="html"
+ <cobertura-report format="xml"
+ destdir="${build.coveragereport}"
+ datafile="${build.coveragereport}/cobertura.ser"
+ >
+ <fileset dir="${project.root}/common/src/main/java" includes="**/*.java" />
+ <fileset dir="${project.root}/build/scratch/common/src" includes="**/*.java" />
+ <fileset dir="${project.root}/broker/src/main/java" includes="**/*.java" />
+ <fileset dir="${project.root}/build/scratch/broker/src" includes="**/*.java" />
+ <fileset dir="${project.root}/client/src/main/java" includes="**/*.java" />
+ <fileset dir="${project.root}/build/scratch/client/src" includes="**/*.java" />
+ </cobertura-report>
+ <cobertura-report format="html"
destdir="${build.coveragereport}"
datafile="${build.coveragereport}/cobertura.ser"
>
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 6345a07844..6d32d7a267 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -561,9 +561,6 @@
<fileset dir="${module.classes}">
<include name="**/*.class"/>
</fileset>
- <fileset dir="${module.test.classes}">
- <include name="**/*.class"/>
- </fileset>
</cobertura-instrument>
</target>