diff options
Diffstat (limited to 'cpp/test/IceSSL/certificateVerification/run.py')
| -rwxr-xr-x | cpp/test/IceSSL/certificateVerification/run.py | 24 |
1 files changed, 15 insertions, 9 deletions
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) |