Make CI pass on XCode up to 15 (#1474)

rustam-gamidov-here · web-flow · commit 8f4627bdd569 · 2024-02-12T14:16:21.000+02:00
* Force leveldb to be built with c++11

For some reason traditional ways gives no '-std=c++11' in the compiler
command line for XCode later than 11.7 in the iOS toolchain.
CMAKE_CXX_STANDARD, set_property(.. CXX_STANDARD ..) are not working.

Relates-To: OAM-2333
Signed-off-by: Rustam Gamidov &lt;ext-rustam.gamidov@here.com&gt;

* Ignore boost and gtest compilation warnings

This is a dirty fix and it's better to find another way to ignore them
especially because macos (not ios) build are OK.

Relates-To: OAM-2333
Signed-off-by: Rustam Gamidov &lt;ext-rustam.gamidov@here.com&gt;

* Remove -noall_load linker option as obsolete

It is obsolete for quite some time and XCode 15 build is failing on it.
In addition it represent the default state

Relates-To: OAM-2333
Signed-off-by: Rustam Gamidov &lt;ext-rustam.gamidov@here.com&gt;

* Add operator&lt;&lt; in tests for optional nested types

These types are used as a boost::optional in gtest expectations
and operator&lt;&lt; for boost::optional is trying to print their value.
Alternative way is to use EXPECT_THAT(...) instead for comparison,
not solving EXPECT_CALL though.

Relates-To: OAM-2333
Signed-off-by: Rustam Gamidov &lt;ext-rustam.gamidov@here.com&gt;

---------

Signed-off-by: Rustam Gamidov &lt;ext-rustam.gamidov@here.com&gt;
diff --git a/cmake/ios/tester/CMakeLists.txt.in b/cmake/ios/tester/CMakeLists.txt.in
@@ -51,7 +51,7 @@ target_link_libraries(${PROJECT_NAME}
     ${SECURITY}
     "-Wl,-force_load"
     ${SVC_TEST_LIB}
-    "-Wl,-noall_load"
+    "-Wl"
     gtest
 )
 
diff --git a/cmake/toolchains/iOS.cmake b/cmake/toolchains/iOS.cmake
@@ -312,8 +312,8 @@ set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 # Symbols visibilty
-set (CMAKE_C_FLAGS "${APPLE_VERSION_FLAG} -isysroot ${CMAKE_OSX_SYSROOT} -fvisibility=hidden -fvisibility-inlines-hidden")
-set (CMAKE_CXX_FLAGS "${APPLE_VERSION_FLAG} -isysroot ${CMAKE_OSX_SYSROOT} -fvisibility=hidden -fvisibility-inlines-hidden")
+set (CMAKE_C_FLAGS "${APPLE_VERSION_FLAG} -isysroot ${CMAKE_OSX_SYSROOT} -fvisibility=hidden -fvisibility-inlines-hidden -Wno-deprecated")
+set (CMAKE_CXX_FLAGS "${APPLE_VERSION_FLAG} -isysroot ${CMAKE_OSX_SYSROOT} -fvisibility=hidden -fvisibility-inlines-hidden -Wno-deprecated")
 
 set (CMAKE_C_LINK_FLAGS "${APPLE_VERSION_FLAG} -Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
 set (CMAKE_CXX_LINK_FLAGS "${APPLE_VERSION_FLAG} -Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -40,7 +40,7 @@ endif()
 
 # Setup versions for external project
 set(OLP_SDK_CPP_GOOGLETEST_URL "https://github.com/google/googletest.git")
-set(OLP_SDK_CPP_GOOGLETEST_TAG "release-1.10.0")
+set(OLP_SDK_CPP_GOOGLETEST_TAG "release-1.12.1")
 
 set(OLP_SDK_CPP_SNAPPY_URL "https://github.com/google/snappy.git")
 set(OLP_SDK_CPP_SNAPPY_TAG "1.1.7")
diff --git a/external/leveldb/CMakeLists-leveldb.txt b/external/leveldb/CMakeLists-leveldb.txt
@@ -99,6 +99,7 @@ if(BUILD_SHARED_LIBS)
 endif(BUILD_SHARED_LIBS)
 
 add_library(leveldb "")
+target_compile_options(leveldb PRIVATE -std=c++11 -Wno-c++11-extensions)
 target_sources(leveldb
   PRIVATE
     "${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
@@ -266,6 +267,7 @@ target_link_libraries(leveldb PUBLIC Threads::Threads)
 add_executable(leveldbutil
   "${PROJECT_SOURCE_DIR}/db/leveldbutil.cc"
 )
+target_compile_options(leveldbutil PRIVATE -std=c++11 -Wno-c++11-extensions)
 target_link_libraries(leveldbutil leveldb)
 
 if(LEVELDB_BUILD_TESTS)
diff --git a/olp-cpp-sdk-core/tests/geo/tiling/TileKeyUtilsTest.cpp b/olp-cpp-sdk-core/tests/geo/tiling/TileKeyUtilsTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 HERE Europe B.V.
+ * Copyright (C) 2019-2024 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <queue>
 #include <vector>
 
diff --git a/olp-cpp-sdk-core/tests/logging/FilterGroupTest.cpp b/olp-cpp-sdk-core/tests/logging/FilterGroupTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 HERE Europe B.V.
+ * Copyright (C) 2020-2024 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,14 @@
 
 #include <olp/core/logging/FilterGroup.h>
 #include <olp/core/logging/Log.h>
+#include <boost/optional/optional_io.hpp>
+#include "TypesToStream.h"
 
 namespace {
 
-using namespace olp::logging;
-using namespace testing;
+using olp::logging::FilterGroup;
+using olp::logging::Level;
+using olp::logging::Log;
 
 TEST(FilterGroupTest, DefaultLevel) {
   FilterGroup filter_group;
diff --git a/olp-cpp-sdk-core/tests/logging/LogTest.cpp b/olp-cpp-sdk-core/tests/logging/LogTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 HERE Europe B.V.
+ * Copyright (C) 2020-2024 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,9 @@
 #include <olp/core/logging/ConsoleAppender.h>
 #include <olp/core/logging/FileAppender.h>
 #include <olp/core/logging/Log.h>
+#include <boost/optional/optional_io.hpp>
 #include "MockAppender.h"
+#include "TypesToStream.h"
 
 namespace {
 
diff --git a/olp-cpp-sdk-dataservice-read/tests/MetadataApiTest.cpp b/olp-cpp-sdk-dataservice-read/tests/MetadataApiTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 HERE Europe B.V.
+ * Copyright (C) 2020-2024 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@
 #include <olp/core/client/OlpClientFactory.h>
 #include <olp/core/client/OlpClientSettingsFactory.h>
 #include <olp/core/utils/Url.h>
+#include <boost/optional/optional_io.hpp>
+#include "TypesToStream.h"
 #include "generated/api/MetadataApi.h"
 
 namespace {
diff --git a/olp-cpp-sdk-dataservice-read/tests/PartitionsCacheRepositoryTest.cpp b/olp-cpp-sdk-dataservice-read/tests/PartitionsCacheRepositoryTest.cpp
@@ -140,6 +140,7 @@ TEST(PartitionsCacheRepositoryTest, DefaultExpiry) {
 
 TEST(PartitionsCacheRepositoryTest, QuadTree) {
   using testing::_;
+  using testing::DoAll;
   using testing::Return;
   using testing::SaveArg;
 
diff --git a/olp-cpp-sdk-dataservice-read/tests/PartitionsRepositoryTest.cpp b/olp-cpp-sdk-dataservice-read/tests/PartitionsRepositoryTest.cpp
@@ -35,6 +35,7 @@
 #include <olp/dataservice/read/PartitionsRequest.h>
 #include <olp/dataservice/read/TileRequest.h>
 #include <olp/dataservice/read/model/Partitions.h>
+#include <boost/optional/optional_io.hpp>
 
 // clang-format off
 #include "generated/parser/PartitionsParser.h"
diff --git a/olp-cpp-sdk-dataservice-write/tests/StreamLayerClientImplTest.cpp b/olp-cpp-sdk-dataservice-write/tests/StreamLayerClientImplTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 HERE Europe B.V.
+ * Copyright (C) 2019-2024 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 #include <mocks/NetworkMock.h>
 #include <olp/core/cache/CacheSettings.h>
 #include <olp/core/client/OlpClientSettingsFactory.h>
+#include <boost/optional/optional_io.hpp>
 #include <unordered_set>
 #include "StreamLayerClientImpl.h"
 
diff --git a/tests/common/TypesToStream.h b/tests/common/TypesToStream.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2024 HERE Europe B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * License-Filename: LICENSE
+ */
+
+#pragma once
+
+#include <string>
+#include <utility>
+
+#include <olp/core/logging/Log.h>
+
+namespace std {
+inline std::ostream& operator<<(
+    std::ostream& os, const std::pair<std::string, std::string>& pair) {
+  return os << "pair< first:'" << pair.first << "'; second: '" << pair.second
+            << "' >";
+}
+}  // namespace std
+
+namespace olp {
+namespace logging {
+inline std::ostream& operator<<(std::ostream& os, const Level level) {
+  switch (level) {
+    case Level::Trace:
+      return os << "Trace";
+    case Level::Debug:
+      return os << "Debug";
+    case Level::Info:
+      return os << "Info";
+    case Level::Warning:
+      return os << "Warning";
+    case Level::Error:
+      return os << "Error";
+    case Level::Fatal:
+      return os << "Fatal";
+    case Level::Off:
+      return os << "Off";
+    default:
+      return os << "Unknown logging level";
+  }
+}
+}  // namespace logging
+}  // namespace olp
diff --git a/tests/integration/olp-cpp-sdk-core/DefaultNetworkTest.cpp b/tests/integration/olp-cpp-sdk-core/DefaultNetworkTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 HERE Europe B.V.
+ * Copyright (C) 2020-2024 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ namespace {
 
 using testing::_;
 using testing::AllOf;
+using testing::DoAll;
 using testing::Mock;
 using testing::Return;
 using testing::SaveArg;

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ target_link_libraries(${PROJECT_NAME}`
`51`	`51`	`${SECURITY}`
`52`	`52`	`"-Wl,-force_load"`
`53`	`53`	`${SVC_TEST_LIB}`
`54`		`- "-Wl,-noall_load"`
	`54`	`+ "-Wl"`
`55`	`55`	`gtest`
`56`	`56`	`)`
`57`	`57`