From 06eaa901379256f8db2114acb4e1bc75002b2527 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Mon, 17 Jul 2023 17:38:31 +0100 Subject: [PATCH] JAL-3599 Updated default eclipse to 'latest' and made jalviewjsLaunchTest timeouts a bit more flexible --- build.gradle | 5 +++-- gradle.properties | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index a47a7fd..7ad6f99 100644 --- a/build.gradle +++ b/build.gradle @@ -4256,7 +4256,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 +4299,7 @@ task jalviewjsLaunchTest { errorOutput = execStderr executable(chromiumBinary) args(execArgs) + println "COMMAND: '"+commandLine.join(" ")+"'" } executor.shutdownNow() } @@ -4316,7 +4317,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) { diff --git a/gradle.properties b/gradle.properties index 75231f3..547304f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -201,7 +201,7 @@ jalviewjs_j2s_alt_file_property_config = j2s.config.altfileproperty # for developing in Eclipse as IDE, set this to automatically copy current swingjs/net.sf.j2s.core.jar to your dropins dir jalviewjs_eclipseIDE_auto_copy_j2s_plugin = false # Override this in a local.properties file -jalviewjs_eclipse_root = ~/buildtools/eclipse/jee-2019-09 +jalviewjs_eclipse_root = ~/buildtools/eclipse/latest jalviewjs_eclipse_dropins_dir = utils/jalviewjs/eclipse/dropins jalviewjs_swingjs_zip = swingjs/SwingJS-site.zip @@ -264,7 +264,8 @@ jalviewjs_j2s_closure_stdout = j2s-closure.out jalviewjs_chromium_binary = ~/buildtools/chromium/chrome jalviewjs_macos_chromium_binary = /Applications/Chromium.app/Contents/MacOS/Chromium jalviewjs_chromium_user_dir = chromium -jalviewjs_chromium_timeout = 30 +jalviewjs_chromium_idle_timeout = 10 +jalviewjs_chromium_overall_timeout = 40 jalviewjs_chromium_profile_name = BUILD jalviewjs_stderr_launch = utils/jalviewjs/chromium_test/jalview_bin_Jalview-stderr.html jalviewjs_desktop_init_string = JALVIEWJS: CREATED DESKTOP -- 1.7.10.2