Adjustments to coverage generation (enable debug logging when coverage on).

This commit is contained in:
Luke Taylor 2010-08-24 18:27:44 +01:00
parent f71d9df7fe
commit 5902c6b262
3 changed files with 15 additions and 6 deletions

1
.gitignore vendored
View File

@ -5,6 +5,7 @@ target/
.DS_Store .DS_Store
.settings/ .settings/
out/ out/
intellij/
build/ build/
*.log *.log
*.iml *.iml

View File

@ -37,6 +37,10 @@ configure(coreModuleProjects) {
sourceSets.main.classesDir = new File(buildDir, "classes/" + project.name.substring("spring-security".length() + 1)) sourceSets.main.classesDir = new File(buildDir, "classes/" + project.name.substring("spring-security".length() + 1))
} }
task coreBuild {
dependsOn coreModuleProjects*.tasks*.matching { task -> task.name == 'build' }
}
configure (aspectjProjects) { configure (aspectjProjects) {
apply from: "$rootDir/gradle/aspectj.gradle" apply from: "$rootDir/gradle/aspectj.gradle"
} }

View File

@ -8,10 +8,11 @@ dependencies{
emma "emma:emma_ant:2.0.5312" emma "emma:emma_ant:2.0.5312"
} }
def emmaMetaDataFile = "${rootProject.buildDir}/emma/metadata.emma" def emmaMetaDataFile = "${rootProject.buildDir}/emma/coverage.em"
def emmaCoverageFile = "${rootProject.buildDir}/emma/coverage.ec"
task emmaInstrument { task emmaInstrument {
dependsOn compileJava dependsOn classes
doFirst { doFirst {
ant.taskdef(resource:"emma_ant.properties", classpath: configurations.emma.asPath) ant.taskdef(resource:"emma_ant.properties", classpath: configurations.emma.asPath)
ant.path(id: "emmarun.classpath") { ant.path(id: "emmarun.classpath") {
@ -33,10 +34,10 @@ afterEvaluate {
tasks.withType(Test.class).each { task -> tasks.withType(Test.class).each { task ->
task.dependsOn emmaInstrument task.dependsOn emmaInstrument
task.configure() { task.configure() {
jvmArgs "-Demma.coverage.out.file=$emmaMetaDataFile", "-Demma.coverage.out.merge=true" jvmArgs '-Dsec.log.level=DEBUG', "-Demma.coverage.out.file=$emmaCoverageFile"
} }
task.doFirst { task.doFirst {
setClasspath(files("$buildDir/emma/classes") + configurations.emma + getClasspath()) classpath = files("$buildDir/emma/classes") + configurations.emma + classpath
} }
} }
} }
@ -52,9 +53,12 @@ if (rootProject.getTasksByName('coverageReport', false).isEmpty()) {
} }
} }
} }
ant.emma(enabled: "true", verbosity: "info") { // use "verbose, trace1, trace2, trace3 for more info" ant.emma(enabled: "true", verbosity: "trace1") { // use "verbose, trace1, trace2, trace3 for more info"
report(sourcepathref:"src.path") { report(sourcepathref:"src.path") {
fileset(file: "$emmaMetaDataFile") fileset(dir: rootProject.buildDir) {
include: '*.ec'
include: '*.emma'
}
txt(outfile: "$rootProject.buildDir/emma/coverage.txt") txt(outfile: "$rootProject.buildDir/emma/coverage.txt")
html(outfile: "$rootProject.buildDir/emma/coverage.html") html(outfile: "$rootProject.buildDir/emma/coverage.html")
// xml(outfile: "$rootProject.buildDir/emma/coverage.xml") // xml(outfile: "$rootProject.buildDir/emma/coverage.xml")