diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-03-16 22:02:43 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-03-16 22:02:43 +0100 |
| commit | caf33525fa4ad992b8030b653ac3fa899e039c81 (patch) | |
| tree | d0737334aa48574c33e4a663287a897c2063215a | |
| parent | ICE-7023 - Ruby 2.3 compatibility (diff) | |
| download | ice-caf33525fa4ad992b8030b653ac3fa899e039c81.tar.bz2 ice-caf33525fa4ad992b8030b653ac3fa899e039c81.tar.xz ice-caf33525fa4ad992b8030b653ac3fa899e039c81.zip | |
Fixed ICE-7024 - IceSSL/configuration test failure on SLES11
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index fd16fe823e7..c1baaf93db2 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -1349,8 +1349,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b } catch(const LocalException& ex) { + // + // OpenSSL < 1.0 doesn't support tls 1.1 so it will also fail, we ignore in this + // case. + // +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L cerr << ex << endl; test(false); +#endif } fact->destroyServer(server); comm->destroy(); |