diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 09:03:13 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 09:03:13 +0200 |
| commit | ff20dd34f91fecfc351804605b822999cde0e593 (patch) | |
| tree | 9abce46a1d5403ad64bf350f6d2b5509a91e7eb6 /cpp/test/IceSSL/configuration/AllTests.cpp | |
| parent | Fix to no longer recursively try endpoints on connection establishment (diff) | |
| download | ice-ff20dd34f91fecfc351804605b822999cde0e593.tar.bz2 ice-ff20dd34f91fecfc351804605b822999cde0e593.tar.xz ice-ff20dd34f91fecfc351804605b822999cde0e593.zip | |
AIX port
Diffstat (limited to 'cpp/test/IceSSL/configuration/AllTests.cpp')
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 4a0cad36e52..d0235809622 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -2024,9 +2024,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b #endif // - // No DSA support in Secure Transport. + // No DSA support in Secure Transport / AIX 7.1 // -#ifndef ICE_USE_SECURE_TRANSPORT +#if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) { // @@ -3192,6 +3192,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b #endif } +#ifndef _AIX + // On AIX 6.1, the default root certificates don't validate demo.zeroc.com + cout << "testing system CAs... " << flush; { InitializationData initData; @@ -3236,6 +3239,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b comm->destroy(); } cout << "ok" << endl; +#endif if(shutdown) { |