Skip to content

Update to Catch2 v3 #632

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 1 commit into from
Aug 11, 2024
Merged

Update to Catch2 v3 #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (NOT Catch2_FOUND)
FetchContent_Declare(
Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v2.13.9)
GIT_TAG v3.5.3)

FetchContent_MakeAvailable(Catch2)

Expand All @@ -35,7 +35,7 @@ add_executable(
target_include_directories(unit_tests PUBLIC ${CATCH_MODULE_PATH})
target_link_libraries(
unit_tests
PRIVATE Catch2::Catch2
PRIVATE Catch2::Catch2WithMain
PRIVATE cppzmq
PRIVATE ${CMAKE_THREAD_LIBS_INIT}
)
Expand Down
2 changes: 1 addition & 1 deletion tests/buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq.hpp>

#ifdef ZMQ_CPP17
Expand Down
2 changes: 1 addition & 1 deletion tests/codec_multipart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq_addon.hpp>

#ifdef ZMQ_CPP11
Expand Down
2 changes: 1 addition & 1 deletion tests/context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq.hpp>

#if (__cplusplus >= 201703L)
Expand Down
3 changes: 1 addition & 2 deletions tests/message.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#define CATCH_CONFIG_MAIN
#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq.hpp>

#if defined(ZMQ_CPP11)
Expand Down
2 changes: 1 addition & 1 deletion tests/multipart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq_addon.hpp>

#ifdef ZMQ_HAS_RVALUE_REFS
Expand Down
2 changes: 1 addition & 1 deletion tests/recv_multipart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq_addon.hpp>
#ifdef ZMQ_CPP11

Expand Down
2 changes: 1 addition & 1 deletion tests/send_multipart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq_addon.hpp>
#ifdef ZMQ_CPP11

Expand Down
2 changes: 1 addition & 1 deletion tests/socket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq.hpp>
#ifdef ZMQ_CPP11
#include <future>
Expand Down
2 changes: 1 addition & 1 deletion tests/socket_ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq.hpp>
#ifdef ZMQ_CPP11

Expand Down
2 changes: 1 addition & 1 deletion tests/testutil.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq.hpp>

#if defined(ZMQ_CPP11)
Expand Down
2 changes: 1 addition & 1 deletion tests/utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <catch2/catch.hpp>
#include <catch2/catch_all.hpp>
#include <zmq.hpp>

#if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL)
Expand Down