summaryrefslogtreecommitdiff
path: root/cpp/test/IceSSL/certificateAndKeyParsing/run.py
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-11-08 18:14:53 +0000
committerMarc Laukien <marc@zeroc.com>2002-11-08 18:14:53 +0000
commit4b2433c82b06bbda1b604e0baaa559e83bac5ce9 (patch)
tree6211a8e432034fd0b05532ca7e7ceaabe1c763f2 /cpp/test/IceSSL/certificateAndKeyParsing/run.py
parentRemoved redundant iostream include that was left behind for tracing. (diff)
downloadice-4b2433c82b06bbda1b604e0baaa559e83bac5ce9.tar.bz2
ice-4b2433c82b06bbda1b604e0baaa559e83bac5ce9.tar.xz
ice-4b2433c82b06bbda1b604e0baaa559e83bac5ce9.zip
fixes
Diffstat (limited to 'cpp/test/IceSSL/certificateAndKeyParsing/run.py')
-rwxr-xr-xcpp/test/IceSSL/certificateAndKeyParsing/run.py14
1 files changed, 6 insertions, 8 deletions
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():