diff options
| author | Jose <jose@zeroc.com> | 2019-10-03 17:17:22 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-10-03 17:17:52 +0200 |
| commit | 1eae32bec782a0b1ad8087f5ec8c1ad080628e08 (patch) | |
| tree | 641177e82530615b8659ac0c31c548c742812734 /cpp | |
| parent | Improved IceGrid/admin test error detection, fix for #546 (diff) | |
| download | ice-1eae32bec782a0b1ad8087f5ec8c1ad080628e08.tar.bz2 ice-1eae32bec782a0b1ad8087f5ec8c1ad080628e08.tar.xz ice-1eae32bec782a0b1ad8087f5ec8c1ad080628e08.zip | |
IceSSL/configuration failures with iOS 13 - close #570
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 9a7b6dbd88a..e7f1b319218 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -696,6 +696,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) Ice::CommunicatorPtr communicator = helper->communicator(); bool elCapitanUpdate2OrLower = false; bool isCatalinaOrGreater = false; + bool isIOS13OrGreater = false; #ifdef __APPLE__ bool isElCapitanOrGreater = false; vector<char> s(256); @@ -712,7 +713,11 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) isElCapitanOrGreater = majorVersion >= 15; elCapitanUpdate2OrLower = (majorVersion == 15) && (minorVersion <= 2); +# if TARGET_OS_IPHONE == 0 isCatalinaOrGreater = majorVersion >= 19; +# else + isIOS13OrGreater = majorVersion >= 18; +# endif } #endif string factoryRef = "factory:" + helper->getTestEndpoint("tcp"); @@ -1301,7 +1306,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) // // macOS catalina does not check the certificate common name // - test(isCatalinaOrGreater); + test(isCatalinaOrGreater || isIOS13OrGreater); } fact->destroyServer(server); @@ -1435,7 +1440,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) // // macOS catalina does not check the certificate common name // - test(isCatalinaOrGreater); + test(isCatalinaOrGreater || isIOS13OrGreater); } #else try |