git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3599 Updated default eclipse to 'latest' and made jalviewjsLaunchTest timeouts...
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
a47a7fd
..
7ad6f99
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-4256,7
+4256,7
@@
task jalviewjsLaunchTest {
def stdout
def stderr
doFirst {
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()) {
def binary = file(chromiumBinary)
if (!binary.exists()) {
@@
-4299,6
+4299,7
@@
task jalviewjsLaunchTest {
errorOutput = execStderr
executable(chromiumBinary)
args(execArgs)
errorOutput = execStderr
executable(chromiumBinary)
args(execArgs)
+ println "COMMAND: '"+commandLine.join(" ")+"'"
}
executor.shutdownNow()
}
}
executor.shutdownNow()
}
@@
-4316,7
+4317,7
@@
task jalviewjsLaunchTest {
executor.shutdownNow()
}
// if no change in stderr for 10s then also end
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) {
executor.shutdownNow()
}
if (stderrString.length() == noChangeBytes) {