JAL-629 correct a timeout. Correct passing html flag.

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index a47a7fd..8ac2757 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1783,6 +1783,27 @@ task testTask1(type: Test) {
   }
 }
 
+task testTask2(type: Test) {
+  group = "Verification"
+  description = "Tests that need to be isolated from the main test run"
+  useTestNG() {
+    includeGroups name
+    excludeGroups testng_excluded_groups.split(",")
+    preserveOrder true
+    useDefaultListeners=true
+  }
+}
+task testTask3(type: Test) {
+  group = "Verification"
+  description = "Tests that need to be isolated from the main test run"
+  useTestNG() {
+    includeGroups name
+    excludeGroups testng_excluded_groups.split(",")
+    preserveOrder true
+    useDefaultListeners=true
+  }
+}
+
 /* insert more testTaskNs here -- change N to next digit or other string */
 /*
 task testTaskN(type: Test) {
@@ -1834,6 +1855,10 @@ tasks.withType(Test).matching {t -> t.getName().startsWith("testTask")}.all { te
     info.events = [ TestLogEvent.FAILED ]
   }
 
+  if (OperatingSystem.current().isMacOsX()) {
+    testTask.systemProperty "apple.awt.UIElement", "true"
+    testTask.environment "JAVA_TOOL_OPTIONS", "-Dapple.awt.UIElement=true"
+  }
 
 
   ignoreFailures = true // Always try to run all tests for all modules
@@ -4256,7 +4281,7 @@ task jalviewjsLaunchTest {
   def stdout
   def stderr
   doFirst {
-    def timeoutms = Integer.valueOf(jalviewjs_chromium_timeout) * 1000
+    def timeoutms = Integer.valueOf(jalviewjs_chromium_overall_timeout) * 1000
     
     def binary = file(chromiumBinary)
     if (!binary.exists()) {
@@ -4299,6 +4324,7 @@ task jalviewjsLaunchTest {
             errorOutput = execStderr
             executable(chromiumBinary)
             args(execArgs)
+            println "COMMAND: '"+commandLine.join(" ")+"'"
           }
           executor.shutdownNow()
         }
@@ -4316,7 +4342,7 @@ task jalviewjsLaunchTest {
             executor.shutdownNow()
           }
           // if no change in stderr for 10s then also end
-          if (noChangeIterations >= 10) {
+          if (noChangeIterations >= jalviewjs_chromium_idle_timeout) {
             executor.shutdownNow()
           }
           if (stderrString.length() == noChangeBytes) {