JAL-4110 allow configuration of stdout/err test output via -Ptest_output=1 and update...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 673cec5..d4dbcd5 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) {
@@ -1830,7 +1851,9 @@ tasks.withType(Test).matching {t -> t.getName().startsWith("testTask")}.all { te
     showExceptions true
     showCauses true
     showStackTraces true
-
+    if (test_output) {
+      showStandardStreams true
+    }
     info.events = [ TestLogEvent.FAILED ]
   }
 
@@ -4260,7 +4283,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()) {
@@ -4303,6 +4326,7 @@ task jalviewjsLaunchTest {
             errorOutput = execStderr
             executable(chromiumBinary)
             args(execArgs)
+            println "COMMAND: '"+commandLine.join(" ")+"'"
           }
           executor.shutdownNow()
         }
@@ -4320,7 +4344,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) {