From 674d18698adf462cf905af5407ef44b468471982 Mon Sep 17 00:00:00 2001
From: Ben Soares <b.soares@dundee.ac.uk>
Date: Fri, 9 Jun 2023 11:15:17 +0100
Subject: [PATCH] JAL-3599 STDOUT and STDERR saved and sent to System.out/err

---
 build.gradle |   31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 23f3a7b..3fc0fed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4242,11 +4242,27 @@ task jalviewjsLaunchTest(type: Exec) {
     chromiumBinary = System.getProperty("user.home") + chromiumBinary.substring(1)
   }
   
+  def stdout
+  def stderr
   doFirst {
     def exec = file(chromiumBinary)
     if (!exec.exists()) {
       throw new GradleException("Could not find chromium binary '${chromiumBinary}'. Cannot run task ${name}.")
     }
+    
+    stdout = new ByteArrayOutputStream()
+    stderr = new ByteArrayOutputStream()
+    if (jalviewjs_j2s_to_console.equals("true")) {
+      standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
+        stdout,
+        System.out)
+      errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
+        stderr,
+        System.err)
+    } else {
+      standardOutput = stdout
+      errorOutput = stderr
+    }
   }
 
   executable(chromiumBinary)
@@ -4260,20 +4276,10 @@ task jalviewjsLaunchTest(type: Exec) {
     "--enable-logging=stderr",
     jalviewjsStderrLaunchFilename
   ])
-
-  /*
-  standardOutput = new ByteArrayOutputStream()
-  errorOutput = new ByteArrayOutputStream()
   
   doLast {
-    println("Chrome STDOUT: ")
-    println(standardOutput.toString())
-    println("Chrome STDERR: ")
-    println(errorOutput.toString())
-
     def found = false
-    def stderr = errorOutput.toString()
-    stderr.eachLine { line ->
+    stderr.toString().eachLine { line ->
       if (line.contains(jalviewjs_desktop_init_string)) {
         println("Found line '"+line+"'")
         found = true
@@ -4283,6 +4289,5 @@ task jalviewjsLaunchTest(type: Exec) {
     if (!found) {
       throw new GradleException("Could not find evidence of Desktop launch in JalviewJS.")
     }
-  }
-  */
+  } 
 }
-- 
1.7.10.2