diff options
| -rw-r--r-- | java/test/controller/build.gradle | 2 | ||||
| -rw-r--r-- | java/test/controller/src/main/java/test/Common/ControllerServer.java (renamed from java/test/controller/src/main/java/test/common/ControllerServer.java) | 16 | ||||
| -rw-r--r-- | java/test/controller/src/main/slice/Controller.ice | 2 | ||||
| -rw-r--r-- | js/test/Common/Controller.ice | 2 | ||||
| -rw-r--r-- | js/test/Common/TestSuite.js | 6 | ||||
| -rw-r--r-- | js/test/Ice/exceptionsBidir/Client.js | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/java/test/controller/build.gradle b/java/test/controller/build.gradle index 1c292d9031a..be8f1a31635 100644 --- a/java/test/controller/build.gradle +++ b/java/test/controller/build.gradle @@ -28,7 +28,7 @@ slice jar { manifest { - attributes("Main-Class": "test.common.ControllerServer") + attributes("Main-Class": "test.Common.ControllerServer") attributes("Class-Path": configurations.runtime.resolve().collect { it.toURI() }.join(' ')) } }
\ No newline at end of file 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 11ca470af65..9fb8ac22e29 100644 --- a/java/test/controller/src/main/java/test/common/ControllerServer.java +++ b/java/test/controller/src/main/java/test/Common/ControllerServer.java @@ -7,11 +7,11 @@ // // ********************************************************************** -package test.common; +package test.Common; -import test.common._ControllerDisp; -import test.common._ServerDisp; -import test.common.ServerPrx; +import test.Common._ControllerDisp; +import test.Common._ServerDisp; +import test.Common.ServerPrx; import java.io.File; import java.io.BufferedReader; @@ -45,9 +45,9 @@ public class ControllerServer extends Ice.Application String line = null; while((line = reader.readLine()) != null) { - if(line.matches(Pattern.quote("starting server... ok")) || - line.matches(Pattern.quote("starting serveramd... 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("starting test.*" + Pattern.quote("Server...") + ".*ok")) { synchronized(ServerI.this) { @@ -155,7 +155,7 @@ public class ControllerServer extends Ice.Application } String script = name.equals("Ice/echo") ? - (lang.equals("java") ? "java/test/src/main/java/" : "cpp/") + "test/Ice/echo/run.py" : + lang + (lang.equals("java") ? "/test/src/main/java/" : "/") + "test/Ice/echo/run.py" : "allTests.py"; java.util.List<String> args = new java.util.ArrayList<String>(); diff --git a/java/test/controller/src/main/slice/Controller.ice b/java/test/controller/src/main/slice/Controller.ice index 5f89858a42d..536e42895d9 100644 --- a/java/test/controller/src/main/slice/Controller.ice +++ b/java/test/controller/src/main/slice/Controller.ice @@ -10,7 +10,7 @@ module test { -module common +module Common { interface Server diff --git a/js/test/Common/Controller.ice b/js/test/Common/Controller.ice index 5f89858a42d..536e42895d9 100644 --- a/js/test/Common/Controller.ice +++ b/js/test/Common/Controller.ice @@ -10,7 +10,7 @@ module test { -module common +module Common { interface Server diff --git a/js/test/Common/TestSuite.js b/js/test/Common/TestSuite.js index 78c533d38cd..cfd27964fd6 100644 --- a/js/test/Common/TestSuite.js +++ b/js/test/Common/TestSuite.js @@ -73,7 +73,7 @@ $(document).ready( { str = "controller:wss -h " + defaultHost + " -p 12008"; } - var controller = test.common.ControllerPrx.uncheckedCast(communicator.stringToProxy(str)); + var controller = test.Common.ControllerPrx.uncheckedCast(communicator.stringToProxy(str)); var p; var server; @@ -84,7 +84,7 @@ $(document).ready( if(typeof(__runEchoServer__) !== "undefined") { srv = "Ice/echo"; - if(typeof(__runEchoServerOptions__) === "Array") + if(typeof(__runEchoServerOptions__) !== "undefined") { options = options.concat(__runEchoServerOptions__); } @@ -101,7 +101,7 @@ $(document).ready( var ref = proxy.ice_getIdentity().name + ":" + protocol + " -h " + defaultHost + " -p " + (protocol == "ws" ? "12009" : "12008"); out.writeLine("ok"); - server = test.common.ServerPrx.uncheckedCast(communicator.stringToProxy(ref)); + server = test.Common.ServerPrx.uncheckedCast(communicator.stringToProxy(ref)); var testCase = TestCases[current]; if(testCase.configurations === undefined) diff --git a/js/test/Ice/exceptionsBidir/Client.js b/js/test/Ice/exceptionsBidir/Client.js index 61a4a319054..67ba6a1ce67 100644 --- a/js/test/Ice/exceptionsBidir/Client.js +++ b/js/test/Ice/exceptionsBidir/Client.js @@ -98,7 +98,7 @@ }; exports.__test__ = run; exports.__runEchoServer__ = true; - exports.__runEchoServerOptions__ = ["--Ice.Warn.Dispatch=0", "--Ice.Warn.Connections=0"]; + exports.__runEchoServerOptions__ = ["Ice.Warn.Dispatch=0", "Ice.Warn.Connections=0"]; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : window.Ice.__require, |