diff options
Diffstat (limited to 'cpp/test/IceSSL/configuration')
| -rw-r--r-- | cpp/test/IceSSL/configuration/Configuration.cpp | 6 | ||||
| -rwxr-xr-x | cpp/test/IceSSL/configuration/run.py | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cpp/test/IceSSL/configuration/Configuration.cpp b/cpp/test/IceSSL/configuration/Configuration.cpp index 3707d31d85d..51a7069ad70 100644 --- a/cpp/test/IceSSL/configuration/Configuration.cpp +++ b/cpp/test/IceSSL/configuration/Configuration.cpp @@ -47,19 +47,19 @@ testContextWithConfig(const Ice::CommunicatorPtr& communicator, {
case IceSSL::Client:
{
- contextString = "Client";
+ contextString = "client";
break;
}
case IceSSL::Server:
{
- contextString = "Server";
+ contextString = "server";
break;
}
case IceSSL::ClientServer:
{
- contextString = "ClientServer";
+ contextString = "client/server";
break;
}
}
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py index 848756709b9..cc95e7ea743 100755 --- a/cpp/test/IceSSL/configuration/run.py +++ b/cpp/test/IceSSL/configuration/run.py @@ -28,7 +28,8 @@ if TestUtil.protocol != "ssl": testdir = os.path.join(toplevel,"test", "IceSSL", "configuration") client = os.path.join(testdir, "configuration") -updatedOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel) +localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost +updatedOptions = localClientOptions.replace("TOPLEVELDIR", toplevel) print "starting configuration...", clientPipe = os.popen(client + updatedOptions) output = clientPipe.read().strip() |