git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4cab0b9)
JAL-4059 Now using "Google Chrome for Testing" https://googlechromelabs.github.io...
authorBen Soares <b.soares@dundee.ac.uk>
Thu, 26 Oct 2023 16:12:48 +0000 (17:12 +0100)
committerBen Soares <b.soares@dundee.ac.uk>
Thu, 26 Oct 2023 16:12:48 +0000 (17:12 +0100)
build.gradle patch | blob | history
gradle.properties patch | blob | history
utils/jalviewjs/chromium_test/jalview_bin_Jalview-stderr.html patch | blob | history

diff --git a/build.gradle b/build.gradle
index e5abc77..78e2466 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -4325,12 +4325,15 @@ task jalviewjsLaunchTest {
       execStdout = stdout
       execStderr = stderr
     }
-    def execArgs = [
+    // macOS not running properly with timeout arguments
+    def execArgs = macOS ? [] : [
+      "--timeout=${timeoutms}",
+      "--virtual-time-budget=${timeoutms}",
+    ]
+    execArgs += [
       "--no-sandbox", // --no-sandbox IS USED BY THE THORIUM APPIMAGE ON THE BUILDSERVER
       "--headless=new",
       "--disable-gpu",
-      "--timeout=${timeoutms}",
-      "--virtual-time-budget=${timeoutms}",
       "--user-data-dir=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_chromium_user_dir}",
       "--profile-directory=${jalviewjs_chromium_profile_name}",
       "--allow-file-access-from-files",
diff --git a/gradle.properties b/gradle.properties
index 79fb11d..5a67a1b 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -264,10 +264,10 @@ jalviewjs_j2s_closure_stdout = j2s-closure.out
 
 # for checking jalviewjs launches okay
 jalviewjs_chromium_binary = ~/buildtools/chromium/chrome
-jalviewjs_macos_chromium_binary = /Applications/Chromium.app/Contents/MacOS/Chromium
+jalviewjs_macos_chromium_binary = ~/buildtools/chromium/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing
 jalviewjs_chromium_user_dir = chromium
-jalviewjs_chromium_idle_timeout = 10
-jalviewjs_chromium_overall_timeout = 40
+jalviewjs_chromium_idle_timeout = 8
+jalviewjs_chromium_overall_timeout = 15
 jalviewjs_chromium_profile_name = BUILD
 jalviewjs_stderr_launch = utils/jalviewjs/chromium_test/jalview_bin_Jalview-stderr.html
 jalviewjs_desktop_init_string = JALVIEWJS: CREATED DESKTOP
diff --git a/utils/jalviewjs/chromium_test/jalview_bin_Jalview-stderr.html b/utils/jalviewjs/chromium_test/jalview_bin_Jalview-stderr.html
index bf7a678..1c95aa1 100644 (file)
--- a/utils/jalviewjs/chromium_test/jalview_bin_Jalview-stderr.html
+++ b/utils/jalviewjs/chromium_test/jalview_bin_Jalview-stderr.html
@@ -21,10 +21,6 @@ Info = {
 </head>
 <body>
 <script>
-// we define console.err because swingjs2.js calls it instead of console.error
-window.console.err = function() {
-       this.error.apply(this,arguments);
-}
 SwingJS.getApplet('testApplet', Info)
 getClassList = function(){J2S._saveFile('_j2sclasslist.txt', Clazz.ClassFilesLoaded.sort().join('\n'))}
 </script>