diff options
| author | Jose <jose@zeroc.com> | 2019-08-15 14:56:57 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-08-15 14:57:37 +0200 |
| commit | 3e3f285e603f18f43f6935e028226d32e62b64e4 (patch) | |
| tree | 58f7988cbf32c77fb70c6d854b93743c2213f8a5 /cpp/test/IceSSL | |
| parent | Fix shadown warnings with recent clang version (diff) | |
| download | ice-3e3f285e603f18f43f6935e028226d32e62b64e4.tar.bz2 ice-3e3f285e603f18f43f6935e028226d32e62b64e4.tar.xz ice-3e3f285e603f18f43f6935e028226d32e62b64e4.zip | |
Fix IceSSL/configuration failures with macOS catalina
Diffstat (limited to 'cpp/test/IceSSL')
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index bd3d2ea6d8d..caae5f854a2 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -695,6 +695,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) { Ice::CommunicatorPtr communicator = helper->communicator(); bool elCapitanUpdate2OrLower = false; + bool isCatalinaOrGreater = false; #ifdef __APPLE__ bool isElCapitanOrGreater = false; vector<char> s(256); @@ -711,6 +712,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) isElCapitanOrGreater = majorVersion >= 15; elCapitanUpdate2OrLower = (majorVersion == 15) && (minorVersion <= 2); + isCatalinaOrGreater = majorVersion >= 19; } #endif string factoryRef = "factory:" + helper->getTestEndpoint("tcp"); @@ -1294,10 +1296,12 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) { server->ice_ping(); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { - cerr << ex << endl; - test(false); + // + // macOS catalina does not check the certificate common name + // + test(isCatalinaOrGreater); } fact->destroyServer(server); @@ -1426,10 +1430,12 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) { server->ice_ping(); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { - cerr << ex << endl; - test(false); + // + // macOS catalina does not check the certificate common name + // + test(isCatalinaOrGreater); } #else try |