diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-07-04 15:28:40 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-04 15:28:40 +0200 |
| commit | 86323430604fa11132678d87c3ce2046d0dcc772 (patch) | |
| tree | 51ddb0251f52cc193bc6d80347d18707d1d3d1ed /js/test/Common/run.py | |
| parent | Fixed few .gitignore files (diff) | |
| download | ice-86323430604fa11132678d87c3ce2046d0dcc772.tar.bz2 ice-86323430604fa11132678d87c3ce2046d0dcc772.tar.xz ice-86323430604fa11132678d87c3ce2046d0dcc772.zip | |
Fixed JS code to align with C++/Java/C# collocation optimization changes, support for running browser tests against Java/C#
Diffstat (limited to 'js/test/Common/run.py')
| -rwxr-xr-x | js/test/Common/run.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/test/Common/run.py b/js/test/Common/run.py index e406f510875..a21ad0b9fd1 100755 --- a/js/test/Common/run.py +++ b/js/test/Common/run.py @@ -68,7 +68,7 @@ class ControllerI(Test.Controller): self.currentServer = None def runServer(self, lang, name, protocol, host, current): - + # If server is still running, terminate it if self.currentServer: try: @@ -85,7 +85,9 @@ class ControllerI(Test.Controller): serverDesc = os.path.join(lang, "test", name) lang = TestUtil.getDefaultMapping() - server = os.path.join(serverdir, TestUtil.getDefaultServerFile()) + server = TestUtil.getDefaultServerFile() + if lang != "java": + server = os.path.join(serverdir, server) serverenv = TestUtil.getTestEnv(lang, serverdir) sys.stdout.write("starting " + serverDesc + "... ") |