Merge branch 'task/JAL-3608_property_set_laf_and_tests_from_Release_2_11_1_Branch...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 7d0a1f9..24f1fd9 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)
@@ -958,6 +958,11 @@ 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
+  }
   sourceCompatibility = compile_source_compatibility
   targetCompatibility = compile_target_compatibility
   jvmArgs += additional_compiler_args