From 2d961837536cd14224ef5f797fb2332ee5c33de7 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 15 May 2024 19:14:18 +0200 Subject: [PATCH 1/4] Update the version of ut in the install test The CI failed because it could not find ut version 1.1. --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 55414299..53a45d4b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,7 +14,7 @@ if(TEST_INSTALLED_VERSION) set(CMAKE_CXX_EXTENSIONS NO) endif() - find_package(ut 1.1 REQUIRED) + find_package(ut 2.0.1 REQUIRED) include(../cmake/AddCustomCommandOrTest.cmake) enable_testing() From aa658cf99fbd9de3595ffc81971f61835e051c74 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 15 May 2024 19:18:18 +0200 Subject: [PATCH 2/4] Fix the tests for the Emscripten build Emscripten cannot compile the parameterized test because it does not recognise std::views::iota. --- example/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 3eb23838..0a72ff8c 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -76,7 +76,7 @@ example(minimal minimal) example(mut mut) example(matcher matcher) -if(NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") +if(NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang" AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Emscripten") example(parameterized parameterized) endif() From 938d33c2137d3f97c5bae21738e93308e74239f7 Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 15 May 2024 19:27:49 +0200 Subject: [PATCH 3/4] Add the --break-system-packages argument to pip in macOS CI script Pip do not want to install packages without it. --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ffc7b830..b0e581e0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -33,7 +33,7 @@ jobs: - name: Install builddriver shell: bash - run: pip3 install builddriver cmake_format==0.6.11 pyyaml + run: pip3 install --break-system-package builddriver cmake_format==0.6.11 pyyaml - name: configure shell: bash From 0e64c2f643ca656277db234d35aa68d32ccf575d Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 15 May 2024 19:33:39 +0200 Subject: [PATCH 4/4] Prevent Apple Clang from using std::source_location It is probably a bug in Apple Clang, the program crash when std::source_location is used in the tests. --- include/boost/ut.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/ut.hpp b/include/boost/ut.hpp index 490ff612..1a686c3e 100644 --- a/include/boost/ut.hpp +++ b/include/boost/ut.hpp @@ -252,7 +252,7 @@ constexpr auto regex_match(const char *str, const char *pattern) -> bool { } // namespace utility namespace reflection { -#if defined(__cpp_lib_source_location) +#if defined(__cpp_lib_source_location) && !defined(_LIBCPP_APPLE_CLANG_VER) using source_location = std::source_location; #else class source_location {