JAL-3541 rejigged clover tasks very mildly

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 7d0a1f9..798aec6 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -84,7 +84,7 @@ ext {
   // Expect jalview.version and target release branch in jalview.release        
   def releaseProps = new Properties();
   def releasePropFile = findProperty("JALVIEW_RELEASE_FILE");
-  def defaultReleasePropFile = "${jalviewDir}/RELEASE";
+  def defaultReleasePropFile = "${jalviewDirAbsolutePath}/RELEASE";
   try {
     (new File(releasePropFile!=null ? releasePropFile : defaultReleasePropFile)).withInputStream { 
      releaseProps.load(it)
@@ -509,8 +509,8 @@ sourceSets {
 
 // clover bits
 dependencies {
+  cloverCompile 'org.openclover:clover:4.4.1'
   if (use_clover) {
-    cloverCompile 'org.openclover:clover:4.4.1'
     testCompile 'org.openclover:clover:4.4.1'
   }
 }
@@ -662,7 +662,7 @@ task cloverInstr {
   outputs.dir cloverInstrDir
 
   doFirst {
-    delete cloverInstrDir
+    //delete cloverInstrDir
     def argsList = [
       "--initstring",
       cloverDb,
@@ -774,6 +774,8 @@ cleanTest {
   dependsOn cleanClover
   doFirst {
     delete sourceSets.test.java.outputDir
+    delete cloverInstrDir
+    delete cloverDb
   }
 }
 
@@ -958,6 +960,16 @@ test {
 
   workingDir = jalviewDir
   //systemProperties 'clover.jar' System.properties.clover.jar
+  def testLaf = project.findProperty("test_laf")
+  if (testLaf != null) {
+    println("Setting Test LaF to '${testLaf}'")
+    systemProperty "laf", testLaf
+  }
+  def testHiDPIScale = project.findProperty("test_HiDPIScale")
+  if (testHiDPIScale != null) {
+    println("Setting Test HiDPI Scale to '${testHiDPIScale}'")
+    systemProperty "sun.java2d.uiScale", testHiDPIScale
+  }
   sourceCompatibility = compile_source_compatibility
   targetCompatibility = compile_target_compatibility
   jvmArgs += additional_compiler_args