Fixed (ICE-5856) - IceJS browser test Ice/timeout fails on Chrome

1 files changed, 18 insertions, 1 deletions

diff --git a/js/test/Common/run.py b/js/test/Common/run.py
index db0d32e2eb2..13e9fe76d77 100755
--- a/js/test/Common/run.py
+++ b/js/test/Common/run.py
@@ -32,6 +32,23 @@ import Ice, Expect
 Ice.loadSlice("\"" + os.path.join(TestUtil.toplevel, "js", "test", "Common", "Controller.ice") + "\"")
 import Test
 
+# The NodeJS interpreter is called "nodejs" on some platforms
+# (e.g., Ubuntu)
+#
+nodeCmd = "node"
+if "NODE" in os.environ:
+    nodeCmd = os.environ["NODE"]
+else:
+    for path in os.environ["PATH"].split(os.pathsep):
+        #
+        # Stop if we find "php" in the PATH first.
+        #
+        if os.path.exists(os.path.join(path, "node")):
+            break
+        elif os.path.exists(os.path.join(path, "nodejs")):
+            nodeCmd = "nodejs"
+            break
+
 class ServerI(Test.Server):
     def __init__(self, name, process):
         self.name = name
@@ -123,7 +140,7 @@ class Reader(threading.Thread):
 class Server(Ice.Application):
     def run(self, args):
         jsDir = os.path.join(TestUtil.toplevel, "js")
-        httpServer = subprocess.Popen("node \"" + os.path.join(jsDir, "bin", "HttpServer.js") + "\"", shell = True,
+        httpServer = subprocess.Popen(nodeCmd + " \"" + os.path.join(jsDir, "bin", "HttpServer.js") + "\"", shell = True,
                                       stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.STDOUT,
                                       bufsize = 0)
         #