diff options
| author | Marc Laukien <marc@zeroc.com> | 2001-11-21 19:22:38 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2001-11-21 19:22:38 +0000 |
| commit | 49d81b377b668cb1182d932ad0b62ddf4e07fc13 (patch) | |
| tree | 9682d8bbf0544e0f5a02722291eaa6b317f79710 /cpp/config/TestUtil.py | |
| parent | fixes (diff) | |
| download | ice-49d81b377b668cb1182d932ad0b62ddf4e07fc13.tar.bz2 ice-49d81b377b668cb1182d932ad0b62ddf4e07fc13.tar.xz ice-49d81b377b668cb1182d932ad0b62ddf4e07fc13.zip | |
fixes
Diffstat (limited to 'cpp/config/TestUtil.py')
| -rw-r--r-- | cpp/config/TestUtil.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index dc6a65533b1..b6dde9fe40f 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -14,14 +14,14 @@ import sys, os protocol = "ssl" serverOptions = " --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.ServerIdleTime=30" + \ - " --Ice.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Ssl.Config=server_sslconfig.xml --Ice.Protocol=" + \ - protocol + " --Ice.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Ssl.Config=server_sslconfig.xml" + \ + " --Ice.Protocol=" + protocol -clientOptions = " --Ice.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Ssl.Config=client_sslconfig.xml --Ice.Protocol=" + \ - protocol +clientOptions = " --Ice.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Ssl.Config=client_sslconfig.xml" + \ + " --Ice.Protocol=" + protocol -collocatedOptions = " --Ice.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Ssl.Config=sslconfig.xml --Ice.Protocol=" + \ - protocol +collocatedOptions = " --Ice.Ssl.CertPath=TOPLEVELDIR/certs --Ice.Ssl.Config=sslconfig.xml" + \ + " --Ice.Protocol=" + protocol serverPids = [] @@ -69,12 +69,14 @@ def clientServerTest(toplevel, name): updatedClientOptions = clientOptions.replace("TOPLEVELDIR", toplevel) print "starting server...", + print server + updatedServerOptions serverPipe = os.popen(server + updatedServerOptions) getServerPid(serverPipe) getAdapterReady(serverPipe) print "ok" print "starting client...", + print client + updatedClientOptions clientPipe = os.popen(client + updatedClientOptions) output = clientPipe.readline() if not output: |