1 files changed, 5 insertions, 8 deletions
diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py
index 52fbc9aaa7a..5037323f2a9 100755
--- a/java/test/Ice/faultTolerance/run.py
+++ b/java/test/Ice/faultTolerance/run.py
@@ -10,7 +10,7 @@
 
 import os, sys
 
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
+for toplevel in [".", "..", "../..", "../../..", "../../../..", "../../../../.."]:
     toplevel = os.path.normpath(toplevel)
     if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
         break
@@ -21,18 +21,15 @@ sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
 name = os.path.join("Ice", "faultTolerance")
-testdir = os.path.join(toplevel, "test", name)
-os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + os.getenv("CLASSPATH", "")
-
-server = TestUtil.javaCmd + " -ea Server"
-client = TestUtil.javaCmd + " -ea Client"
+testdir = os.path.dirname(os.path.abspath(__file__))
+os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + os.pathsep + os.getenv("CLASSPATH", "")
 
 num = 12
 base = 12340
 
 for i in range(0, num):
     print "starting server #%d..." % (i + 1),
-    serverPipe = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1")
+    serverPipe = TestUtil.startServer("Server", " %d" % (base + i) + " 2>&1")
     TestUtil.getAdapterReady(serverPipe)
     print "ok"
 
@@ -40,7 +37,7 @@ ports = ""
 for i in range(0, num):
     ports = "%s %d" % (ports, base + i)
 print "starting client...",
-clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports + " 2>&1")
+clientPipe = TestUtil.startClient("Client", ports + " 2>&1")
 print "ok"
 
 TestUtil.printOutputFromPipe(clientPipe)