diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-13 17:57:32 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-13 17:57:32 +0100 |
| commit | b238f3e728439c3c35eaf660d646399cdc45cdee (patch) | |
| tree | 8b85597367982847ed228cde0ba1ae3e294635bf /cpp/test/IceSSL/configuration/Server.cpp | |
| parent | Fixed IceSSL/configuration iOS build failure (diff) | |
| download | ice-b238f3e728439c3c35eaf660d646399cdc45cdee.tar.bz2 ice-b238f3e728439c3c35eaf660d646399cdc45cdee.tar.xz ice-b238f3e728439c3c35eaf660d646399cdc45cdee.zip | |
Fixed ICE-7501 & ICE-7502 - Integrated the building of the controller Apps to the gmake build system, IceSSL test fix
Diffstat (limited to 'cpp/test/IceSSL/configuration/Server.cpp')
| -rw-r--r-- | cpp/test/IceSSL/configuration/Server.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp index ed1ddb25e74..9b9696d64b3 100644 --- a/cpp/test/IceSSL/configuration/Server.cpp +++ b/cpp/test/IceSSL/configuration/Server.cpp @@ -19,13 +19,15 @@ int run(int argc, char** argv, const Ice::CommunicatorPtr& communicator) { string testdir; -#if TARGET_OS_IPHONE == 0 +#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0 if(argc < 2) { cerr << "Usage: " << argv[0] << " testdir" << endl; return 1; } testdir = string(argv[1]) + "/../certs"; +#else + testdir = "certs"; #endif communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0, "tcp")); |