From: BobHanson Date: Sun, 22 Mar 2020 12:59:01 +0000 (-0500) Subject: JAL-3563 adds Jalview.setSynchronous() testing X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=01891650a6dad4f1c723a97136569bb62258b390;p=jalview.git JAL-3563 adds Jalview.setSynchronous() testing --- diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java index 0d7ef6b..4ffc022 100644 --- a/test/jalview/bin/CommandLineOperations.java +++ b/test/jalview/bin/CommandLineOperations.java @@ -203,11 +203,21 @@ public class CommandLineOperations { System.out.println(ln); successfulCMDs.add(ln); + if (ln.equals(Jalview.TERMINATOR_LINE)) + { + break; + } } - while ((ln = worker.getErrorReader().readLine()) != null) + if (worker != null && worker.exit == null) { - System.err.println(ln); + worker.interrupt(); + Thread.currentThread().interrupt(); + worker.process.destroy(); } + // while ((ln = worker.getErrorReader().readLine()) != null) + // { + // System.err.println(ln); + // } } @@ -228,6 +238,7 @@ public class CommandLineOperations { break; } + if (++count > 5) { break;