mirror of
https://github.com/azahar-emu/mcl
synced 2025-11-06 23:20:08 +01:00
tests: Update to Catch 3.0.1
This commit is contained in:
parent
8aeacfe329
commit
b38a9d2ef8
@ -93,7 +93,7 @@ endif()
|
|||||||
# Dependencies
|
# Dependencies
|
||||||
|
|
||||||
if (NOT TARGET Catch2::Catch2)
|
if (NOT TARGET Catch2::Catch2)
|
||||||
find_package(Catch2 QUIET)
|
find_package(Catch2 3 QUIET)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT TARGET fmt::fmt)
|
if (NOT TARGET fmt::fmt)
|
||||||
|
|||||||
@ -2,14 +2,13 @@ add_executable(mcl-tests
|
|||||||
bit/bit_field_tests.cpp
|
bit/bit_field_tests.cpp
|
||||||
container/hmap.cpp
|
container/hmap.cpp
|
||||||
container/ihmap.cpp
|
container/ihmap.cpp
|
||||||
main.cpp
|
|
||||||
mp/metavalue_tests.cpp
|
mp/metavalue_tests.cpp
|
||||||
mp/typelist_tests.cpp
|
mp/typelist_tests.cpp
|
||||||
type_traits/type_traits_tests.cpp
|
type_traits/type_traits_tests.cpp
|
||||||
)
|
)
|
||||||
target_include_directories(mcl-tests PUBLIC .)
|
target_include_directories(mcl-tests PUBLIC .)
|
||||||
target_compile_options(mcl-tests PRIVATE ${STAMINA_CXX_FLAGS})
|
target_compile_options(mcl-tests PRIVATE ${STAMINA_CXX_FLAGS})
|
||||||
target_link_libraries(mcl-tests PRIVATE Catch2::Catch2 mcl)
|
target_link_libraries(mcl-tests PRIVATE Catch2::Catch2WithMain mcl)
|
||||||
|
|
||||||
include(CTest)
|
include(CTest)
|
||||||
include(Catch)
|
include(Catch)
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
#include <array>
|
#include <array>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
|
||||||
#include <catch2/catch.hpp>
|
#include <catch2/catch_test_macros.hpp>
|
||||||
#include <mcl/bit/bit_field.hpp>
|
#include <mcl/bit/bit_field.hpp>
|
||||||
#include <mcl/stdint.hpp>
|
#include <mcl/stdint.hpp>
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
#include <catch2/catch.hpp>
|
#include <catch2/catch_test_macros.hpp>
|
||||||
#include <fmt/core.h>
|
#include <fmt/core.h>
|
||||||
#include <mcl/container/hmap.hpp>
|
#include <mcl/container/hmap.hpp>
|
||||||
#include <mcl/stdint.hpp>
|
#include <mcl/stdint.hpp>
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
#include <catch2/catch.hpp>
|
#include <catch2/catch_test_macros.hpp>
|
||||||
#include <fmt/core.h>
|
#include <fmt/core.h>
|
||||||
#include <mcl/container/ihmap.hpp>
|
#include <mcl/container/ihmap.hpp>
|
||||||
#include <mcl/stdint.hpp>
|
#include <mcl/stdint.hpp>
|
||||||
|
|||||||
@ -1,6 +0,0 @@
|
|||||||
// This file is part of the mcl project.
|
|
||||||
// Copyright (c) 2022 merryhime
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
#define CATCH_CONFIG_MAIN
|
|
||||||
#include "catch2/catch.hpp"
|
|
||||||
Loading…
x
Reference in New Issue
Block a user