fixes

18 files changed, 69 insertions, 76 deletions

diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py
index 918d826265e..cc0f3522482 100755
--- a/cpp/test/Freeze/evictor/run.py
+++ b/cpp/test/Freeze/evictor/run.py
@@ -32,5 +32,5 @@ testdir = os.path.join(toplevel, "test", name)
 dbdir = os.path.join(testdir, "db")
 TestUtil.cleanDbDir(dbdir)
 
-TestUtil.clientServerTestWithOptions(toplevel, name, " " + testdir, "")
+TestUtil.clientServerTestWithOptions(name, " " + testdir, "")
 sys.exit(0)
diff --git a/cpp/test/Ice/adapterDeactivation/run.py b/cpp/test/Ice/adapterDeactivation/run.py
index d230bc3657c..c4407a2ca68 100755
--- a/cpp/test/Ice/adapterDeactivation/run.py
+++ b/cpp/test/Ice/adapterDeactivation/run.py
@@ -27,6 +27,6 @@ import TestUtil
 
 name = os.path.join("Ice", "adapterDeactivation")
 
-TestUtil.clientServerTest(toplevel, name)
-TestUtil.collocatedTest(toplevel, name)
+TestUtil.clientServerTest(name)
+TestUtil.collocatedTest(name)
 sys.exit(0)
diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py
index b832ebefcc0..39b9b18a4b9 100755
--- a/cpp/test/Ice/exceptions/run.py
+++ b/cpp/test/Ice/exceptions/run.py
@@ -27,6 +27,6 @@ import TestUtil
 
 name = os.path.join("Ice", "exceptions")
 
-TestUtil.clientServerTest(toplevel, name)
-TestUtil.collocatedTest(toplevel, name)
+TestUtil.clientServerTest(name)
+TestUtil.collocatedTest(name)
 sys.exit(0)
diff --git a/cpp/test/Ice/facets/run.py b/cpp/test/Ice/facets/run.py
index 1fd4846df21..f9d93b10da0 100755
--- a/cpp/test/Ice/facets/run.py
+++ b/cpp/test/Ice/facets/run.py
@@ -27,6 +27,6 @@ import TestUtil
 
 name = os.path.join("Ice", "facets")
 
-TestUtil.clientServerTest(toplevel, name)
-TestUtil.collocatedTest(toplevel, name)
+TestUtil.clientServerTest(name)
+TestUtil.collocatedTest(name)
 sys.exit(0)
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index 151f149d27a..e06b110f939 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -32,13 +32,10 @@ client = os.path.join(testdir, "client")
 num = 6
 base = 12340
 
-updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-
 serverPipes = { }
 for i in range(0, num):
     print "starting server #%d..." % (i + 1),
-    serverPipes[i] = os.popen(server + updatedServerOptions + " %d" % (base + i))
+    serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i))
     TestUtil.getServerPid(serverPipes[i])
     TestUtil.getAdapterReady(serverPipes[i])
     print "ok"
@@ -47,7 +44,7 @@ ports = ""
 for i in range(0, num):
     ports = "%s %d" % (ports, base + i)
 print "starting client...",
-clientPipe = os.popen(client + updatedClientOptions + " " + ports)
+clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports)
 print "ok"
 
 for output in clientPipe.xreadlines():
diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py
index 1f7dd687e29..3cb6f4cec39 100755
--- a/cpp/test/Ice/inheritance/run.py
+++ b/cpp/test/Ice/inheritance/run.py
@@ -27,6 +27,6 @@ import TestUtil
 
 name = os.path.join("Ice", "inheritance")
 
-TestUtil.clientServerTest(toplevel, name)
-TestUtil.collocatedTest(toplevel, name)
+TestUtil.clientServerTest(name)
+TestUtil.collocatedTest(name)
 sys.exit(0)
diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py
index 3fffd5cba84..a2b30f10e3b 100755
--- a/cpp/test/Ice/location/run.py
+++ b/cpp/test/Ice/location/run.py
@@ -27,5 +27,5 @@ import TestUtil
 
 name = os.path.join("Ice", "location")
 
-TestUtil.mixedClientServerTest(toplevel, name)
+TestUtil.mixedClientServerTest(name)
 sys.exit(0)
diff --git a/cpp/test/Ice/locationForward/run.py b/cpp/test/Ice/locationForward/run.py
index f665ebda4b5..2fba1589028 100755
--- a/cpp/test/Ice/locationForward/run.py
+++ b/cpp/test/Ice/locationForward/run.py
@@ -32,9 +32,6 @@ client = os.path.join(testdir, "client")
 num = 5
 base = 12340
 
-updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-
 serverPipes = { }
 for i in range(0, num):
     if i + 1 < num:
@@ -42,7 +39,7 @@ for i in range(0, num):
     else:
         s = " %d" % (base + i)
     print "starting server #%d..." % (i + 1),
-    command = server + updatedServerOptions + s;
+    command = server + TestUtil.serverOptions + s;
     serverPipes[i] = os.popen(command)
     TestUtil.getServerPid(serverPipes[i])
     TestUtil.getAdapterReady(serverPipes[i])
@@ -50,7 +47,7 @@ for i in range(0, num):
 
 print "starting client...",
 s = " %d %d" % (base, (base + num - 1))
-command = client + updatedClientOptions + s
+command = client + TestUtil.clientOptions + s
 clientPipe = os.popen(command)
 print "ok"
 
diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py
index 29706d1678b..07067bf38fe 100755
--- a/cpp/test/Ice/objects/run.py
+++ b/cpp/test/Ice/objects/run.py
@@ -27,6 +27,6 @@ import TestUtil
 
 name = os.path.join("Ice", "objects")
 
-TestUtil.clientServerTest(toplevel, name)
-TestUtil.collocatedTest(toplevel, name)
+TestUtil.clientServerTest(name)
+TestUtil.collocatedTest(name)
 sys.exit(0)
diff --git a/cpp/test/Ice/operations/run.py b/cpp/test/Ice/operations/run.py
index be59dffaf74..7c1bde7457d 100755
--- a/cpp/test/Ice/operations/run.py
+++ b/cpp/test/Ice/operations/run.py
@@ -27,6 +27,6 @@ import TestUtil
 
 name = os.path.join("Ice", "operations")
 
-TestUtil.clientServerTest(toplevel, name)
-TestUtil.collocatedTest(toplevel, name)
+TestUtil.clientServerTest(name)
+TestUtil.collocatedTest(name)
 sys.exit(0)
diff --git a/cpp/test/IcePack/deployer/application.xml b/cpp/test/IcePack/deployer/application.xml
index 89fe1061479..0ecfb0b542e 100644
--- a/cpp/test/IcePack/deployer/application.xml
+++ b/cpp/test/IcePack/deployer/application.xml
@@ -3,8 +3,8 @@
    <node name="localnode" basedir="${basedir}">
 
      <server name="Yellow" descriptor="yellow_icebox.xml"/>
-     <server name="IceBox1" descriptor="icebox.xml"/>
-     <server name="IceBox2" descriptor="icebox.xml"/>
+     <server name="IceBox1" binpath="../../../bin/icebox" descriptor="icebox.xml"/>
+     <server name="IceBox2" binpath="../../../bin/icebox" descriptor="icebox.xml"/>
      <server name="Server1" binpath="./server" descriptor="server.xml"/>
      <server name="Server2" binpath="./server" descriptor="server.xml" targets="target1 target2"/>
 
diff --git a/cpp/test/IcePack/deployer/run.py b/cpp/test/IcePack/deployer/run.py
index f078f09223d..5c510903f3a 100755
--- a/cpp/test/IcePack/deployer/run.py
+++ b/cpp/test/IcePack/deployer/run.py
@@ -28,19 +28,20 @@ import IcePackAdmin
 
 testdir = os.path.join(toplevel, "test", "IcePack", "deployer")
 
-os.environ['LD_LIBRARY_PATH'] = testdir + ":" + os.environ['LD_LIBRARY_PATH']
+if not TestUtil.isWin32():
+    os.environ["LD_LIBRARY_PATH"] = testdir + ":" + os.environ["LD_LIBRARY_PATH"]
 
 #
 # Start the client.
 #
 def startClient(options):
 
-    updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel) + \
-                           " --Ice.Default.Locator=\"IcePack/Locator:default -p 12346\" " + \
-                           options
+    fullClientOptions = TestUtil.clientOptions + \
+                        " --Ice.Default.Locator=\"IcePack/Locator:default -p 12346\" " + \
+                        options
 
     print "starting client...",
-    clientPipe = os.popen(os.path.join(testdir, "client") + updatedClientOptions)
+    clientPipe = os.popen(os.path.join(testdir, "client") + fullClientOptions)
     print "ok"
 
     for output in clientPipe.xreadlines():
@@ -54,21 +55,20 @@ def startClient(options):
 # Start IcePack.
 #
 IcePackAdmin.cleanDbDir(os.path.join(testdir, "db"))
-
-icePackRegistryPipe = IcePackAdmin.startIcePackRegistry(toplevel, "12346", testdir)
-icePackNodePipe = IcePackAdmin.startIcePackNode(toplevel, testdir)
+icePackRegistryPipe = IcePackAdmin.startIcePackRegistry("12346", testdir)
+icePackNodePipe = IcePackAdmin.startIcePackNode(testdir)
 
 #
 # Deploy the application, run the client and remove the application.
 #
 print "deploying application...",
-IcePackAdmin.addApplication(toplevel, os.path.join(testdir, "application.xml"), "");
+IcePackAdmin.addApplication(os.path.join(testdir, "application.xml"), "");
 print "ok"
 
 startClient("")
 
 print "removing application...",
-IcePackAdmin.removeApplication(toplevel, os.path.join(testdir, "application.xml"));
+IcePackAdmin.removeApplication(os.path.join(testdir, "application.xml"));
 print "ok"
 
 #
@@ -76,19 +76,19 @@ print "ok"
 # client to test targets (-t options) and remove the application.
 #
 print "deploying application with target...",
-IcePackAdmin.addApplication(toplevel, os.path.join(testdir, "application.xml"), "debug localnode.Server1.manual")
+IcePackAdmin.addApplication(os.path.join(testdir, "application.xml"), "debug localnode.Server1.manual")
 print "ok"
 
 startClient("-t")
 
 print "removing application...",
-IcePackAdmin.removeApplication(toplevel, os.path.join(testdir, "application.xml"));
+IcePackAdmin.removeApplication(os.path.join(testdir, "application.xml"));
 print "ok"
 
 #
 # Shutdown IcePack.
 #
-IcePackAdmin.shutdownIcePackNode(toplevel, icePackNodePipe)
-IcePackAdmin.shutdownIcePackRegistry(toplevel, icePackRegistryPipe)
+IcePackAdmin.shutdownIcePackNode(icePackNodePipe)
+IcePackAdmin.shutdownIcePackRegistry(icePackRegistryPipe)
 
 sys.exit(0)
diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py
index 28eca1d22ed..533d38b7302 100755
--- a/cpp/test/IcePack/simple/run.py
+++ b/cpp/test/IcePack/simple/run.py
@@ -35,32 +35,31 @@ testdir = os.path.join(toplevel, "test", "IcePack", "simple")
 #
 additionalOptions = " --Ice.Default.Locator=\"IcePack/Locator:default -p 12346\""
 
-
 IcePackAdmin.cleanDbDir(os.path.join(testdir, "db"))
 
 #
 # Start IcePack registry
 # 
-icePackRegistryPipe = IcePackAdmin.startIcePackRegistry(toplevel, "12346", testdir)
+icePackRegistryPipe = IcePackAdmin.startIcePackRegistry("12346", testdir)
 
 #
 # Test client/server without on demand activation.
 #
 additionalServerOptions=" --TestAdapter.Endpoints=default --TestAdapter.AdapterId=TestAdapter " + additionalOptions
-TestUtil.mixedClientServerTestWithOptions(toplevel, name, additionalServerOptions, additionalOptions)
+TestUtil.mixedClientServerTestWithOptions(name, additionalServerOptions, additionalOptions)
 
 #
 # Shutdown the registry.
 #
-IcePackAdmin.shutdownIcePackRegistry(toplevel, icePackRegistryPipe)
+IcePackAdmin.shutdownIcePackRegistry(icePackRegistryPipe)
 
 IcePackAdmin.cleanDbDir(os.path.join(testdir, "db"))
 
 #
 # Start the registry and a node.
 #
-icePackRegistryPipe = IcePackAdmin.startIcePackRegistry(toplevel, "12346", testdir)
-icePackNodePipe = IcePackAdmin.startIcePackNode(toplevel, testdir)
+icePackRegistryPipe = IcePackAdmin.startIcePackRegistry("12346", testdir)
+icePackNodePipe = IcePackAdmin.startIcePackNode(testdir)
 
 #
 # Test client/server with on demand activation.
@@ -69,7 +68,7 @@ server = os.path.join(testdir, "server")
 client = os.path.join(testdir, "client")
 
 print "registering server with icepack...",
-IcePackAdmin.addServer(toplevel, "server", os.path.join(testdir, "simple_server.xml"), server, "", "");
+IcePackAdmin.addServer("server", os.path.join(testdir, "simple_server.xml"), server, "", "");
 print "ok"
   
 updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel) + additionalOptions
@@ -87,10 +86,10 @@ if clientStatus:
     sys.exit(1)
     
 print "unregister server with icepack...",
-IcePackAdmin.removeServer(toplevel, "server");
+IcePackAdmin.removeServer("server");
 print "ok"
 
-IcePackAdmin.shutdownIcePackNode(toplevel, icePackNodePipe)
-IcePackAdmin.shutdownIcePackRegistry(toplevel, icePackRegistryPipe)
+IcePackAdmin.shutdownIcePackNode(icePackNodePipe)
+IcePackAdmin.shutdownIcePackRegistry(icePackRegistryPipe)
 
 sys.exit(0)
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
index 667f3335ff5..20e03a10b88 100755
--- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
@@ -29,20 +29,18 @@ if TestUtil.protocol != "ssl" :
     print "This test may only be run with SSL enabled."
     sys.exit(0)
 
-testOptions = " --IceSSL.Test.Client.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \
-              " --IceSSL.Server.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \
-              " --IceSSL.Server.Config= " + \
-              " --IceSSL.Client.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \
-              " --IceSSL.Client.Config= "
+testOptions = " --IceSSL.Test.Client.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
+              " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
+              " --IceSSL.Client.Config= " + \
+              " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
+              " --IceSSL.Server.Config= "
 
 testdir = os.path.join(toplevel,"test", "IceSSL", "certificateAndKeyParsing")
 client = os.path.join(testdir, "certificateAndKeyParsing")
 
 localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
-updatedOptions = localClientOptions.replace("TOPLEVELDIR", toplevel)
-testOptions = testOptions.replace("TOPLEVELDIR", toplevel)
 print "starting certificateAndKeyParsing...",
-clientPipe = os.popen(client + updatedOptions + testOptions)
+clientPipe = os.popen(client + localClientOptions + testOptions)
 print "ok"
 
 for output in clientPipe.xreadlines():
diff --git a/cpp/test/IceSSL/certificateVerification/run.py b/cpp/test/IceSSL/certificateVerification/run.py
index 705382af0a7..9038b280d80 100755
--- a/cpp/test/IceSSL/certificateVerification/run.py
+++ b/cpp/test/IceSSL/certificateVerification/run.py
@@ -29,22 +29,28 @@ if TestUtil.protocol != "ssl":
     print "This test may only be run with SSL enabled."
     sys.exit(0)
 
-TestUtil.clientOptions += \
-    " --IceSSL.Test.Client.CertPath=TOPLEVELDIR/test/IceSSL/certs"
-TestUtil.serverOptions += \
-    " --IceSSL.Test.Server.CertPath=TOPLEVELDIR/test/IceSSL/certs"
-TestUtil.clientServerOptions += \
-    " --IceSSL.Test.Client.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \
-    " --IceSSL.Test.Server.CertPath=TOPLEVELDIR/test/IceSSL/certs"
+testOptions = " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
+              " --IceSSL.Client.Config= " + \
+              " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
+              " --IceSSL.Server.Config= "
+
+TestUtil.clientOptions += " --IceSSL.Test.Client.CertPath=" + \
+                          os.path.join(toplevel, "test", "IceSSL", "certs")
+TestUtil.serverOptions += " --IceSSL.Test.Server.CertPath=" + \
+                          os.path.join(toplevel, "test", "IceSSL", "certs")
+TestUtil.clientServerOptions += " --IceSSL.Test.Client.CertPath=" + \
+                                os.path.join(toplevel, "test", "IceSSL", "certs") + \
+                                " --IceSSL.Test.Server.CertPath=" + \
+                                os.path.join(toplevel, "test", "IceSSL", "certs")
 
 name = os.path.join("IceSSL", "certificateVerification")
 
 print "testing default certificate verifier."
-TestUtil.clientServerTest(toplevel, name)
+TestUtil.clientServerTest(name)
 
 print "testing single-certificate certificate verifier."
 TestUtil.clientOptions += " --IceSSL.Client.CertificateVerifier=singleCert"
 TestUtil.serverOptions += " --IceSSL.Server.CertificateVerifier=singleCert"
-TestUtil.clientServerTest(toplevel, name)
+TestUtil.clientServerTest(name)
 
 sys.exit(0)
diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py
index 43f2aec9091..84f28dab0ff 100755
--- a/cpp/test/IceSSL/certificateVerifier/run.py
+++ b/cpp/test/IceSSL/certificateVerifier/run.py
@@ -33,9 +33,8 @@ testdir = os.path.join(toplevel,"test", "IceSSL", "certificateVerifier")
 client = os.path.join(testdir, "certificateVerifier")
 
 localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
-updatedOptions = localClientOptions.replace("TOPLEVELDIR", toplevel)
 print "starting certificateVerifier...",
-clientPipe = os.popen(client + updatedOptions)
+clientPipe = os.popen(client + localClientOptions)
 print "ok"
 
 for output in clientPipe.xreadlines():
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index f787ac3e0fd..fcfa47e4f51 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -33,9 +33,8 @@ testdir = os.path.join(toplevel,"test", "IceSSL", "configuration")
 client = os.path.join(testdir, "configuration")
 
 localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
-updatedOptions = localClientOptions.replace("TOPLEVELDIR", toplevel)
 print "starting configuration...",
-clientPipe = os.popen(client + updatedOptions)
+clientPipe = os.popen(client + localClientOptions)
 print "ok"
 
 for output in clientPipe.xreadlines():
diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py
index 6712182b76a..1b289b4ee48 100755
--- a/cpp/test/IceSSL/loadPEM/run.py
+++ b/cpp/test/IceSSL/loadPEM/run.py
@@ -29,19 +29,17 @@ if TestUtil.protocol != "ssl":
     print "This test may only be run with SSL enabled."
     sys.exit(0)
 
-testOptions = " --IceSSL.Client.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \
+testOptions = " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
               " --IceSSL.Client.Config= " + \
-              " --IceSSL.Server.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \
+              " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
               " --IceSSL.Server.Config= "
 
 testdir = os.path.join(toplevel,"test", "IceSSL", "loadPEM")
 client = os.path.join(testdir, "loadPEM")
 
 localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
-updatedOptions = localClientOptions.replace("TOPLEVELDIR", toplevel)
-testOptions = testOptions.replace("TOPLEVELDIR", toplevel)
 print "starting loadPEM...",
-clientPipe = os.popen(client + updatedOptions + testOptions)
+clientPipe = os.popen(client + localClientOptions + testOptions)
 print "ok"
 
 for output in clientPipe.xreadlines():