diff options
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 + "... ") |