many fixes to run scripts

5 files changed, 13 insertions, 4 deletions

diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
index 20e03a10b88..1680f62256f 100755
--- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
@@ -35,7 +35,9 @@ testOptions = " --IceSSL.Test.Client.CertPath=" + os.path.join(toplevel, "test",
               " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
               " --IceSSL.Server.Config= "
 
-testdir = os.path.join(toplevel,"test", "IceSSL", "certificateAndKeyParsing")
+name = os.path.join("IceSSL", "certificateAndKeyParsing")
+testdir = os.path.join(toplevel, "test", name)
+
 client = os.path.join(testdir, "certificateAndKeyParsing")
 
 localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
diff --git a/cpp/test/IceSSL/certificateVerification/run.py b/cpp/test/IceSSL/certificateVerification/run.py
index 9038b280d80..4820bc86503 100755
--- a/cpp/test/IceSSL/certificateVerification/run.py
+++ b/cpp/test/IceSSL/certificateVerification/run.py
@@ -44,6 +44,7 @@ TestUtil.clientServerOptions += " --IceSSL.Test.Client.CertPath=" + \
                                 os.path.join(toplevel, "test", "IceSSL", "certs")
 
 name = os.path.join("IceSSL", "certificateVerification")
+testdir = os.path.join(toplevel, "test", name)
 
 print "testing default certificate verifier."
 TestUtil.clientServerTest(name)
diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py
index 84f28dab0ff..82ef9d81a1d 100755
--- a/cpp/test/IceSSL/certificateVerifier/run.py
+++ b/cpp/test/IceSSL/certificateVerifier/run.py
@@ -29,7 +29,9 @@ if TestUtil.protocol != "ssl":
     print "This test may only be run with SSL enabled."
     sys.exit(0)
 
-testdir = os.path.join(toplevel,"test", "IceSSL", "certificateVerifier")
+name = os.path.join("IceSSL", "certificateVerifier")
+testdir = os.path.join(toplevel, "test", name)
+
 client = os.path.join(testdir, "certificateVerifier")
 
 localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index fcfa47e4f51..54e3e2362cc 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -29,7 +29,9 @@ if TestUtil.protocol != "ssl":
     print "This test may only be run with SSL enabled."
     sys.exit(0)
 
-testdir = os.path.join(toplevel,"test", "IceSSL", "configuration")
+name = os.path.join("IceSSL", "configuration")
+testdir = os.path.join(toplevel, "test", name)
+
 client = os.path.join(testdir, "configuration")
 
 localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py
index 1b289b4ee48..a391851d784 100755
--- a/cpp/test/IceSSL/loadPEM/run.py
+++ b/cpp/test/IceSSL/loadPEM/run.py
@@ -34,7 +34,9 @@ testOptions = " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "test", "Ice
               " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "test", "IceSSL", "certs") + \
               " --IceSSL.Server.Config= "
 
-testdir = os.path.join(toplevel,"test", "IceSSL", "loadPEM")
+name = os.path.join("IceSSL", "loadPEM")
+testdir = os.path.join(toplevel, "test", name)
+
 client = os.path.join(testdir, "loadPEM")
 
 localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost