CXX-2661 Add macos-1100 tasks and move ubuntu1404 -> ubuntu2204 (#974)

eramongodb · web-flow · commit 418e219d4b6d · 2023-06-15T15:26:28.000-05:00
* CXX-2661 Add macos-1100 tests * Address -Wrange-loop-analysis warnings * CXX-2657 Move GCC/Clang debug compile tasks from ubuntu1404 to ubuntu2204 * Detect Boost polyfill via CMakeCXXSymbolExists
diff --git a/.mci.yml b/.mci.yml
@@ -1612,29 +1612,29 @@ buildvariants:
         - name: clang-tidy
         - name: compile_without_tests
 
-    - name: ubuntu1404-debug-gcc
-      display_name: "Ubuntu 14.04 Debug (g++ 4.8)"
+    - name: ubuntu2204-debug-gcc
+      display_name: "Ubuntu 22.04 Debug (GCC)"
       expansions:
         build_type: "Debug"
         tar_options: *linux_tar_options
         cmake_flags: *linux_cmake_flags
         mongodb_version: *version_latest
         compiler: g++
       run_on:
-        - ubuntu1404-small
+        - ubuntu2204-small
       tasks:
         - name: compile_without_tests
 
-    - name: ubuntu1404-debug-clang
-      display_name: "Ubuntu 14.04 Debug (clang++ 3.4)"
+    - name: ubuntu2204-debug-clang
+      display_name: "Ubuntu 22.04 Debug (Clang)"
       expansions:
         build_type: "Debug"
         tar_options: *linux_tar_options
         cmake_flags: *linux_cmake_flags
         mongodb_version: *version_latest
         compiler: clang++
       run_on:
-        - ubuntu1404-small
+        - ubuntu2204-small
       tasks:
         - name: compile_without_tests
 
@@ -1797,7 +1797,7 @@ buildvariants:
     #######################################
     #         Mac and Windows             #
     #######################################
-    - name: macos-1014-latest
+    - name: macos-1014-latest # CXX-2661: remove in favor of macos-1100.
       display_name: "MacOS 10.14 Release (Boost) (MongoDB Latest)"
       expansions:
           build_type: "Release"
@@ -1813,7 +1813,7 @@ buildvariants:
           - name: compile_and_test_with_static_libs
           - name: compile_and_test_with_static_libs_extra_alignment
 
-    - name: macos-1014-50
+    - name: macos-1014-50 # CXX-2661: remove in favor of macos-1100.
       display_name: "MacOS 10.14 Release (Boost) (MongoDB 5.0)"
       expansions:
           build_type: "Release"
@@ -1829,7 +1829,7 @@ buildvariants:
           - name: compile_and_test_with_static_libs
           - name: compile_and_test_with_static_libs_extra_alignment
 
-    - name: macos-1014-versioned-api
+    - name: macos-1014-versioned-api # CXX-2661: remove in favor of macos-1100.
       display_name: "MacOS 10.14 Release Versioned API"
       expansions:
           build_type: "Release"
@@ -1843,6 +1843,52 @@ buildvariants:
           - name: test_versioned_api
           - name: test_versioned_api_accept_version_two
 
+    - name: macos-1100-latest
+      display_name: "MacOS 11.0 Release (Boost) (MongoDB Latest)"
+      expansions:
+          build_type: "Release"
+          extra_path: *macos_extra_path
+          cmake_flags: *macos_cmake_flags
+          poly_flags: *poly_boost_flags
+          mongodb_version: *version_latest
+      run_on:
+          - macos-1100
+      tasks:
+          - name: compile_and_test_with_shared_libs
+          - name: compile_and_test_with_shared_libs_extra_alignment
+          - name: compile_and_test_with_static_libs
+          - name: compile_and_test_with_static_libs_extra_alignment
+
+    - name: macos-1100-50
+      display_name: "MacOS 11.0 Release (Boost) (MongoDB 5.0)"
+      expansions:
+          build_type: "Release"
+          extra_path: *macos_extra_path
+          cmake_flags: *macos_cmake_flags
+          poly_flags: *poly_boost_flags
+          mongodb_version: *version_50
+      run_on:
+          - macos-1100
+      tasks:
+          - name: compile_and_test_with_shared_libs
+          - name: compile_and_test_with_shared_libs_extra_alignment
+          - name: compile_and_test_with_static_libs
+          - name: compile_and_test_with_static_libs_extra_alignment
+
+    - name: macos-1100-versioned-api
+      display_name: "MacOS 11.0 Release Versioned API"
+      expansions:
+          build_type: "Release"
+          extra_path: *macos_extra_path
+          cmake_flags: *macos_cmake_flags
+          poly_flags: *poly_boost_flags
+          mongodb_version: *version_latest
+      run_on:
+          - macos-1100
+      tasks:
+          - name: test_versioned_api
+          - name: test_versioned_api_accept_version_two
+
     - name: windows-2k8-release
       display_name: "Windows (VS 2015) Release (MongoDB 4.2)"
       expansions:
diff --git a/examples/projects/bsoncxx/cmake-deprecated/shared/CMakeLists.txt b/examples/projects/bsoncxx/cmake-deprecated/shared/CMakeLists.txt
@@ -40,13 +40,13 @@ find_package(libbsoncxx REQUIRED)
 
 add_executable(hello_bsoncxx ../../hello_bsoncxx.cpp)
 
-# Visual Studio pre 2017 requires boost polyfill.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    if (CMAKE_CXX_STANDARD LESS 17)
-        find_package(Boost 1.56.0 REQUIRED)
-        target_link_libraries(hello_bsoncxx PRIVATE Boost::boost)
-        target_compile_definitions(hello_bsoncxx PRIVATE BSONCXX_POLY_USE_BOOST=ON)
-    endif ()
+# Deprecated libbsoncxx CMake config does not automatically handle the Boost polyfill dependency.
+include(CheckCXXSymbolExists)
+set(CMAKE_REQUIRED_INCLUDES ${LIBBSONCXX_INCLUDE_DIRS})
+check_cxx_symbol_exists(BSONCXX_POLY_USE_BOOST "bsoncxx/config/config.hpp" NEEDS_BOOST_POLYFILL)
+if (NEEDS_BOOST_POLYFILL)
+    find_package(Boost 1.56.0 REQUIRED)
+    target_link_libraries(hello_bsoncxx PRIVATE Boost::boost)
 endif()
 
 target_include_directories(hello_bsoncxx
diff --git a/examples/projects/bsoncxx/cmake-deprecated/static/CMakeLists.txt b/examples/projects/bsoncxx/cmake-deprecated/static/CMakeLists.txt
@@ -40,13 +40,13 @@ find_package(libbsoncxx-static REQUIRED)
 
 add_executable(hello_bsoncxx ../../hello_bsoncxx.cpp)
 
-# Visual Studio pre 2017 requires boost polyfill.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    if (CMAKE_CXX_STANDARD LESS 17)
-        find_package(Boost 1.56.0 REQUIRED)
-        target_link_libraries(hello_bsoncxx PRIVATE Boost::boost)
-        target_compile_definitions(hello_bsoncxx PRIVATE BSONCXX_POLY_USE_BOOST=ON)
-    endif ()
+# Deprecated libbsoncxx CMake config does not automatically handle the Boost polyfill dependency.
+include(CheckCXXSymbolExists)
+set(CMAKE_REQUIRED_INCLUDES ${LIBBSONCXX_STATIC_INCLUDE_DIRS})
+check_cxx_symbol_exists(BSONCXX_POLY_USE_BOOST "bsoncxx/config/config.hpp" NEEDS_BOOST_POLYFILL)
+if (NEEDS_BOOST_POLYFILL)
+    find_package(Boost 1.56.0 REQUIRED)
+    target_link_libraries(hello_bsoncxx PRIVATE Boost::boost)
 endif()
 
 target_include_directories(hello_bsoncxx
diff --git a/examples/projects/mongocxx/cmake-deprecated/shared/CMakeLists.txt b/examples/projects/mongocxx/cmake-deprecated/shared/CMakeLists.txt
@@ -40,13 +40,13 @@ find_package(libmongocxx REQUIRED)
 
 add_executable(hello_mongocxx ../../hello_mongocxx.cpp)
 
-# Visual Studio pre 2017 requires boost polyfill.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    if (CMAKE_CXX_STANDARD LESS 17)
-        find_package(Boost 1.56.0 REQUIRED)
-        target_link_libraries(hello_mongocxx PRIVATE Boost::boost)
-        target_compile_definitions(hello_mongocxx PRIVATE BSONCXX_POLY_USE_BOOST=ON)
-    endif ()
+# Deprecated libbsoncxx CMake config does not automatically handle the Boost polyfill dependency.
+include(CheckCXXSymbolExists)
+set(CMAKE_REQUIRED_INCLUDES ${LIBMONGOCXX_INCLUDE_DIRS})
+check_cxx_symbol_exists(BSONCXX_POLY_USE_BOOST "bsoncxx/config/config.hpp" NEEDS_BOOST_POLYFILL)
+if (NEEDS_BOOST_POLYFILL)
+    find_package(Boost 1.56.0 REQUIRED)
+    target_link_libraries(hello_mongocxx PRIVATE Boost::boost)
 endif()
 
 target_include_directories(hello_mongocxx
diff --git a/examples/projects/mongocxx/cmake-deprecated/static/CMakeLists.txt b/examples/projects/mongocxx/cmake-deprecated/static/CMakeLists.txt
@@ -40,13 +40,13 @@ find_package(libmongocxx-static REQUIRED)
 
 add_executable(hello_mongocxx ../../hello_mongocxx.cpp)
 
-# Visual Studio pre 2017 requires boost polyfill.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    if (CMAKE_CXX_STANDARD LESS 17)
-        find_package(Boost 1.56.0 REQUIRED)
-        target_link_libraries(hello_mongocxx PRIVATE Boost::boost)
-        target_compile_definitions(hello_mongocxx PRIVATE BSONCXX_POLY_USE_BOOST=ON)
-    endif ()
+# Deprecated libbsoncxx CMake config does not automatically handle the Boost polyfill dependency.
+include(CheckCXXSymbolExists)
+set(CMAKE_REQUIRED_INCLUDES ${LIBMONGOCXX_STATIC_INCLUDE_DIRS})
+check_cxx_symbol_exists(BSONCXX_POLY_USE_BOOST "bsoncxx/config/config.hpp" NEEDS_BOOST_POLYFILL)
+if (NEEDS_BOOST_POLYFILL)
+    find_package(Boost 1.56.0 REQUIRED)
+    target_link_libraries(hello_mongocxx PRIVATE Boost::boost)
 endif()
 
 target_include_directories(hello_mongocxx
diff --git a/src/mongocxx/test/spec/unified_tests/runner.cpp b/src/mongocxx/test/spec/unified_tests/runner.cpp
@@ -263,7 +263,7 @@ bool compatible_with_server(const bsoncxx::array::element& requirement) {
             throw e;
         }
 
-        for (const auto kvp : server_params.get_document().view()) {
+        for (const auto& kvp : server_params.get_document().view()) {
             const auto param = kvp.key();
             const auto value = kvp.get_value();
             // If actual parameter is unset or unequal to requirement, skip test.
@@ -954,7 +954,7 @@ void assert_outcome(const array::element& test) {
     if (!test["outcome"])
         return;
 
-    for (const auto outcome : test["outcome"].get_array().value) {
+    for (const auto& outcome : test["outcome"].get_array().value) {
         CAPTURE(to_json(outcome.get_document()));
 
         const auto db_name = outcome["databaseName"].get_string().value;
@@ -1033,7 +1033,7 @@ const std::map<std::pair<mongocxx::stdx::string_view, mongocxx::stdx::string_vie
 void run_tests(mongocxx::stdx::string_view test_description, document::view test) {
     REQUIRE(test["tests"]);
 
-    for (const auto ele : test["tests"].get_array().value) {
+    for (const auto& ele : test["tests"].get_array().value) {
         const auto description = string::to_string(ele["description"].get_string().value);
         SECTION(description) {
             {
@@ -1066,7 +1066,7 @@ void run_tests(mongocxx::stdx::string_view test_description, document::view test
 
             operations::state state;
 
-            for (const auto ops : ele["operations"].get_array().value) {
+            for (const auto& ops : ele["operations"].get_array().value) {
                 const auto ignore_result_and_error = [&]() -> bool {
                     const auto elem = ops["ignoreResultAndError"];
                     return elem && elem.get_bool().value;
