From: Ben Soares <b.soares@dundee.ac.uk>
Date: Fri, 18 Aug 2023 13:35:41 +0000 (+0100)
Subject: Merge branch 'improvement/JAL-4212_remove_macos_test_java_icons' into merge/big_merge... 
X-Git-Tag: Release_2_11_3_0~8^2~46
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e73c44c30780c03d952cfe223742e9f996c75022;hp=-c;p=jalview.git

Merge branch 'improvement/JAL-4212_remove_macos_test_java_icons' into merge/big_merge_of_bens_stuff_before_2_11_3_0
---

e73c44c30780c03d952cfe223742e9f996c75022
diff --combined build.gradle
index 7ad6f99,673cec5..c4ed582
--- a/build.gradle
+++ b/build.gradle
@@@ -1834,6 -1834,10 +1834,10 @@@ tasks.withType(Test).matching {t -> t.g
      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 -4260,7 +4260,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,7 -4303,6 +4303,7 @@@
              errorOutput = execStderr
              executable(chromiumBinary)
              args(execArgs)
 +            println "COMMAND: '"+commandLine.join(" ")+"'"
            }
            executor.shutdownNow()
          }
@@@ -4317,7 -4320,7 +4321,7 @@@
              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) {