From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 3 Feb 2020 16:24:59 +0000 (+0000)
Subject: JAL-3510 JAL-3153 clover instrumentation for tests
X-Git-Tag: Release_2_11_1_1~29^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ftask%2FJAL-3510-update-clover-to-4.4.1;p=jalview.git

JAL-3510 JAL-3153 clover instrumentation for tests
---

diff --git a/build.gradle b/build.gradle
index c78bfc9..ba884a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -272,7 +272,7 @@ sourceSets {
     compileClasspath = files( sourceSets.test.java.outputDir )
 
     if (use_clover) {
-      compileClasspath += sourceSets.clover.compileClasspath
+      compileClasspath = sourceSets.clover.compileClasspath
     } else {
       compileClasspath += files(sourceSets.main.java.outputDir)
     }
@@ -452,7 +452,7 @@ eclipse {
 
 task cloverInstr() {
   // only instrument source, we build test classes as normal
-  inputs.files files (sourceSets.main.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
+  inputs.files files (sourceSets.main.allJava,sourceSets.test.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
   outputs.dir cloverInstrDir
 
   doFirst {