X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=2b9cf4e54b7e045746ea4d2ecf4a753307619a3f;hb=bcfc7c04c50b67ff066a534ee0b8baa53af4cf79;hp=77cd9abe63ab641e019190d68e03aab8a9822226;hpb=ace0af5edbf14c1cefcc4bdb31723d8be68631be;p=jalview.git

diff --git a/build.gradle b/build.gradle
index 77cd9ab..2b9cf4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -136,6 +136,10 @@ ext {
     getdownChannelName = string("${bamboo_planKey}/${JAVA_VERSION}")
     getdownAppBase = string("${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}")
     jvlChannelName += "_${getdownChannelName}"
+    // automatically add the test group Not-bamboo for exclusion 
+    if ("".equals(testngExcludedGroups)) { 
+      testngExcludedGroups = "Not-bamboo"
+    }
     break
 
     case "RELEASE":
@@ -405,8 +409,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'
   }
 }
@@ -558,7 +562,7 @@ task cloverInstr {
   outputs.dir cloverInstrDir
 
   doFirst {
-    //delete cloverInstrDir
+    delete cloverInstrDir
     def argsList = [
       "--initstring",
       cloverDb,
@@ -608,6 +612,26 @@ task cloverReport {
     com.atlassian.clover.reporters.xml.XMLReporter.runReport(args)
   }
 }
+
+
+compileCloverJava {
+
+  doFirst {
+    sourceCompatibility = compile_source_compatibility
+    targetCompatibility = compile_target_compatibility
+    options.compilerArgs += additional_compiler_args
+    print ("Setting target compatibility to "+targetCompatibility+"\n")
+  }
+  classpath += configurations.cloverRuntime
+}
+
+
+task cleanClover {
+  doFirst {
+    delete cloverInstrDir
+    delete cloverDb
+  }
+}
 // end clover bits
 
 
@@ -639,18 +663,6 @@ compileTestJava {
 }
 
 
-compileCloverJava {
-
-  doFirst {
-    sourceCompatibility = compile_source_compatibility
-    targetCompatibility = compile_target_compatibility
-    options.compilerArgs += additional_compiler_args
-    print ("Setting target compatibility to "+targetCompatibility+"\n")
-  }
-  classpath += configurations.cloverRuntime
-}
-
-
 clean {
   doFirst {
     delete sourceSets.main.java.outputDir
@@ -658,14 +670,6 @@ clean {
 }
 
 
-task cleanClover {
-  doFirst {
-    delete cloverInstrDir
-    delete cloverDb
-  }
-}
-
-
 cleanTest {
   dependsOn cleanClover
   doFirst {
@@ -845,10 +849,13 @@ test {
 
   useTestNG() {
     includeGroups testngGroups
+    excludeGroups testngExcludedGroups
     preserveOrder true
     useDefaultListeners=true
   }
 
+  maxHeapSize = "1024m"
+
   workingDir = jalviewDir
   //systemProperties 'clover.jar' System.properties.clover.jar
   sourceCompatibility = compile_source_compatibility