Use Catch2v3 for the unit test suite #26
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This moves from the old header-only Catch2 version 2.x included in GUL14 to the newer 3.x family of the unit test framework. Accordingly, the header files that need to be included change. Signed-off-by: Lars Froehlich <lars.froehlich@desy.de>
alt-graph
requested review from
Finii,
MissPeppermintPatty,
ohensler and
wyrnat
[why] This way we can avoid having to install it for CI runs. Signed-off-by: Lars Froehlich <lars.froehlich@desy.de>
Signed-off-by: Lars Froehlich <lars.froehlich@desy.de>
alt-graph
force-pushed
the
move_to_catch2v3
branch
from
aeb674c to
efacfe8
Compare
[why] We need modern support for wrap files without explicitly requesting a fallback in the meson.build. So why not go to an up-to-date version? Signed-off-by: Lars Froehlich <lars.froehlich@desy.de>
Member
Author
|
This currently builds all of Catch2v3 in the CI runs. Once we drop Ubuntu 20.04, we can just pre-install the |
Finii
requested changes
Mar 24, 2025
Contributor
Finii
left a comment
Finii
left a comment
There was a problem hiding this comment.
debian/control has no Build-Depends on Catch2v3.
[why] We now require Catch2 v3 from an external package for building the unit test suite. Proposed-by: Fini Jastrow <fini.jastrow@desy.de> Signed-off-by: Lars Froehlich <lars.froehlich@desy.de>
Member
Author
Good point, added. |
[why] The precompiled library form of the Catch2 framework that we use was introduced in Catch2 3.4.0-1 or something like that. Proposed-by: Fini Jastrow <ulf.fini.jastrow@desy.de> Signed-off-by: Lars Froehlich <lars.froehlich@desy.de>
Finii
reviewed
Mar 25, 2025
Contributor
|
Sorry this seems all so complicated, but I believe it is good to get this right at one place before we reuse our 'pattern' throughout doocs. |
This changes the build-depends clause from "catch2 (>>3.4.0)" to
"catch2 (>=3.4.0) | libcatch2". Rationale (Fini):
"
Hmm, we have a problem here, out there is just this one package that
is an in-between one:
3.4.0-1build1: Only on Ubuntu, and there on 24.04 and 24.10.
The header only catch2 packages were called catch2
The library v3 version is destined to be called libcatch2
There is a transitional package transmogrifying catch2 to libcatch2
On Ubuntu systems after 24.10 it is possible to install libcatch2 and
not have catch2 installed.
On Debian we do not have this break, and Catch2v3 is always available
as libcatch2.
"
Co-authored-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
Signed-off-by: Lars Froehlich <lars.froehlich@desy.de>
Finii
approved these changes
Mar 25, 2025
[why] To bring the requirement in sync with the one listed in the Debian control file. Proposed-by: Fini Jastrow <ulf.fini.jastrow@desy.de> Signed-off-by: Lars Froehlich <lars.froehlich@desy.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This moves from the old header-only Catch2 version 2.x included in GUL14 to the newer 3.x family of the unit test framework. Accordingly, the header files that need to be included change.