diff options
| author | Keith Wall <kwall@apache.org> | 2012-07-19 14:54:04 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2012-07-19 14:54:04 +0000 |
| commit | c54a1ba9aab37fd44beeda6557a70b5624acd858 (patch) | |
| tree | d84c3b96c3e002cbf226289dace3132224eb1368 /qpid/java/build.xml | |
| parent | b5e915845606ddba2ac859e4de85cfee9bd50603 (diff) | |
| download | qpid-python-c54a1ba9aab37fd44beeda6557a70b5624acd858.tar.gz | |
QPID-4152 : Refactor coverage targets in Java build system.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1363358 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/build.xml')
| -rw-r--r-- | qpid/java/build.xml | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/qpid/java/build.xml b/qpid/java/build.xml index a41cff4d78..a6dc513ee8 100644 --- a/qpid/java/build.xml +++ b/qpid/java/build.xml @@ -46,6 +46,9 @@ <property name="resources" value="${project.root}/resources"/> + <!-- Modules for which coverage will be created by the cover-test target --> + <property name="coverage.modules" value="${modules}"/> + <map property="release.excludes" value="${modules}"> <globmapper from="*" to="*/\*\*"/> </map> @@ -217,33 +220,39 @@ </target> <target name="coverage-report" description="generate coverage report" depends="cobertura-init"> - <cobertura-merge datafile="${build.coveragereport}/cobertura.ser"> + <mkdir dir="${build.coverage.report}" /> + <mkdir dir="${build.coverage.src}" /> + + <cobertura-merge datafile="${build.coverage.report}/cobertura.ser"> <!-- merge all module coverage reports --> <fileset dir="${build}"> <include name="**/*.ser"/> </fileset> </cobertura-merge> + + <!-- Copy all covered sources to single directory for cobertura report --> + + <foreach property="module" list="${coverage.modules}"> + + <copy todir="${build.coverage.src}"> + <fileset dir="${module}/src/main/java" includes="**/*.java"/> + </copy> + + <copy todir="${build.coverage.src}"> + <fileset dir="build/scratch/${module}/src" includes="**/*.java"/> + </copy> + </foreach> + <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" /> + destdir="${build.coverage.report}" + datafile="${build.coverage.report}/cobertura.ser"> + <fileset dir="${build.coverage.src}" includes="**/*.java" /> </cobertura-report> - <cobertura-report format="html" - 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 format="html" + destdir="${build.coverage.report}" + datafile="${build.coverage.report}/cobertura.ser"> + <fileset dir="${build.coverage.src}" includes="**/*.java" /> </cobertura-report> </target> @@ -252,7 +261,7 @@ </target> <target name="cover-test" description="run tests and generate coverage information" depends="build"> - <iterate target="cover-test" modules="broker client common"/> + <iterate target="cover-test" modules="${coverage.modules}"/> </target> <target name="test-interop" depends="build,compile-tests" |