Skip to content

fix: update catch to 2.13.5 to fix glibc 2.34 failures #3679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 6, 2022
Merged

fix: update catch to 2.13.5 to fix glibc 2.34 failures #3679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99cdc0f
Download catch for MinGw
Skylion007 Feb 3, 2022
788cbf4
Fix rest of MinGW
Skylion007 Feb 3, 2022
666f13f
fix: update catch to 2.13.5 to fix glibc 2.34 failures
mgorny Feb 3, 2022
86817db
fix: add option for _ check, only define on pybind11
henryiii Feb 4, 2022
e5884a9
Revert "fix: add option for _ check, only define on pybind11"
henryiii Feb 6, 2022
3197c6f
fix: only undef _ for catch cpp creation.
henryiii Feb 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ jobs:
- name: Configure C++11
# LTO leads to many undefined reference like
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -S . -B build
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DDOWNLOAD_CATCH=ON -S . -B build

- name: Build C++11
run: cmake --build build -j 2
Expand All @@ -932,7 +932,7 @@ jobs:
run: git clean -fdx

- name: Configure C++14
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -S . -B build2
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DDOWNLOAD_CATCH=ON -S . -B build2

- name: Build C++14
run: cmake --build build2 -j 2
Expand All @@ -950,7 +950,7 @@ jobs:
run: git clean -fdx

- name: Configure C++17
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -S . -B build3
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DDOWNLOAD_CATCH=ON -S . -B build3

- name: Build C++17
run: cmake --build build3 -j 2
Expand Down
2 changes: 1 addition & 1 deletion tests/test_embed/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if("${PYTHON_MODULE_EXTENSION}" MATCHES "pypy" OR "${Python_INTERPRETER_ID}" STR
return()
endif()

find_package(Catch 2.13.2)
find_package(Catch 2.13.5)

if(CATCH_FOUND)
message(STATUS "Building interpreter tests using Catch v${CATCH_VERSION}")
Expand Down
5 changes: 5 additions & 0 deletions tests/test_embed/catch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
# pragma warning(disable: 4996)
#endif

// Catch uses _ internally, which breaks gettext style defines
#ifdef _
#undef _
#endif

#define CATCH_CONFIG_RUNNER
#include <catch.hpp>

Expand Down