diff options
| -rw-r--r-- | java/test/controller/src/main/java/Test/Common/ControllerServer.java | 24 | ||||
| -rwxr-xr-x | scripts/TestUtil.py | 1 |
2 files changed, 18 insertions, 7 deletions
diff --git a/java/test/controller/src/main/java/Test/Common/ControllerServer.java b/java/test/controller/src/main/java/Test/Common/ControllerServer.java index b59376e10b9..5e4e9fc938b 100644 --- a/java/test/controller/src/main/java/Test/Common/ControllerServer.java +++ b/java/test/controller/src/main/java/Test/Common/ControllerServer.java @@ -44,19 +44,19 @@ public class ControllerServer extends Ice.Application { final BufferedReader reader = new BufferedReader(new InputStreamReader(_is)); - String line = null; - while((line = reader.readLine()) != null) + String line = reader.readLine(); + while(line != null) { if(_started == 0) { _processOutput.append(line + "\n"); } - if(line.matches(Pattern.quote("starting server...") + ".*ok") || - line.matches(Pattern.quote("starting serveramd...") + ".*ok") || - line.matches(Pattern.quote("starting servertie...") + ".*ok") || - line.matches(Pattern.quote("starting serveramdtie...") + ".*ok") || - line.matches("starting test.*" + Pattern.quote("Server...") + ".*ok")) + if(line.matches(Pattern.quote("starting server...") + ".*ok.*") || + line.matches(Pattern.quote("starting serveramd...") + ".*ok.*") || + line.matches(Pattern.quote("starting servertie...") + ".*ok.*") || + line.matches(Pattern.quote("starting serveramdtie...") + ".*ok.*") || + line.matches("starting test.*" + Pattern.quote("Server...") + ".*ok.*")) { synchronized(ServerI.this) { @@ -64,7 +64,17 @@ public class ControllerServer extends Ice.Application ServerI.this.notifyAll(); } } + else if(line.matches(Pattern.quote("starting server...") + ".*") || + line.matches(Pattern.quote("starting serveramd...") + ".*") || + line.matches(Pattern.quote("starting servertie...") + ".*") || + line.matches(Pattern.quote("starting serveramdtie...") + ".*") || + line.matches("starting test.*" + Pattern.quote("Server...") + ".*")) + { + line += reader.readLine(); + continue; + } System.out.println(line); + line = reader.readLine(); } } catch(java.io.IOException ex) diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 7f7ad138c83..1084a024b32 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1028,6 +1028,7 @@ def getCommandLineProperties(exe, config): # Turn on network tracing. # #components.append("--Ice.Trace.Network=3") + #components.append("--Ice.Trace.Protocol=1") # # Now we add additional components dependent on the desired |