diff options
| author | Anthony Neal <aneal@zeroc.com> | 2002-04-17 13:39:11 +0000 |
|---|---|---|
| committer | Anthony Neal <aneal@zeroc.com> | 2002-04-17 13:39:11 +0000 |
| commit | 2d87ee439067aa882d32e685e94cfe1c019c6451 (patch) | |
| tree | 827fad7dbcfc3409715c301a8726099610454118 /cpp | |
| parent | icepatch fixes (diff) | |
| download | ice-2d87ee439067aa882d32e685e94cfe1c019c6451.tar.bz2 ice-2d87ee439067aa882d32e685e94cfe1c019c6451.tar.xz ice-2d87ee439067aa882d32e685e94cfe1c019c6451.zip | |
Fixed some silly assumptions I was making in these tests about the values
of the Ice.SSL.[Client|Server].Config properties.
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/test/IceSSL/certificateAndKeyParsing/run.py | 6 | ||||
| -rwxr-xr-x | cpp/test/IceSSL/loadPEM/run.py | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py index 8694a25caf0..c06aba50d01 100755 --- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py +++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py @@ -25,7 +25,11 @@ if TestUtil.protocol != "ssl" : print "This test may only be run with SSL enabled." sys.exit(0) -testOptions = " --Ice.SSL.Test.Client.CertPath=TOPLEVELDIR/test/IceSSL/certs" +testOptions = " --Ice.SSL.Test.Client.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \ + " --Ice.SSL.Server.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \ + " --Ice.SSL.Server.Config= " + \ + " --Ice.SSL.Client.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \ + " --Ice.SSL.Client.Config= " testdir = os.path.join(toplevel,"test", "IceSSL", "certificateAndKeyParsing") client = os.path.join(testdir, "certificateAndKeyParsing") diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py index 4ea2daf062e..3a5965d6203 100755 --- a/cpp/test/IceSSL/loadPEM/run.py +++ b/cpp/test/IceSSL/loadPEM/run.py @@ -25,12 +25,15 @@ if TestUtil.protocol != "ssl": print "This test may only be run with SSL enabled." sys.exit(0) -testOptions = " --Ice.SSL.Client.CertPath=TOPLEVELDIR/test/IceSSL/certs" +testOptions = " --Ice.SSL.Client.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \ + " --Ice.SSL.Client.Config= " + \ + " --Ice.SSL.Server.CertPath=TOPLEVELDIR/test/IceSSL/certs" + \ + " --Ice.SSL.Server.Config= " testdir = os.path.join(toplevel,"test", "IceSSL", "loadPEM") client = os.path.join(testdir, "loadPEM") -loaclClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost +localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost updatedOptions = localClientOptions.replace("TOPLEVELDIR", toplevel) testOptions = testOptions.replace("TOPLEVELDIR", toplevel) print "starting loadPEM...", |