VERY experimental Nintendo Switch 2 emulator
C++
tests: update catch2 to 3.0.1
Alexandre Bouvier5c2cf3945510
diff --git a/CMakeLists.txt b/CMakeLists.txtindex cee720940c..658a2816b5 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -242,7 +242,7 @@ if (ENABLE_WEB_SERVICE)endif()if (YUZU_TESTS)- find_package(Catch2 2.13.7 REQUIRED)+ find_package(Catch2 3.0.1 REQUIRED)endif()find_package(Boost 1.73.0 COMPONENTS context)diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txtindex 9b65e79cbf..ae84408bcf 100644--- a/src/tests/CMakeLists.txt+++ b/src/tests/CMakeLists.txt@@ -14,7 +14,6 @@ add_executable(testscore/core_timing.cppcore/internal_network/network.cppprecompiled_headers.h- tests.cppvideo_core/buffer_base.cppinput_common/calibration_configuration_job.cpp)@@ -22,7 +21,7 @@ add_executable(testscreate_target_directory_groups(tests)target_link_libraries(tests PRIVATE common core input_common)-target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} Catch2::Catch2 Threads::Threads)+target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} Catch2::Catch2WithMain Threads::Threads)add_test(NAME tests COMMAND tests)diff --git a/src/tests/common/bit_field.cpp b/src/tests/common/bit_field.cppindex 0071ae52e8..75e990ecd9 100644--- a/src/tests/common/bit_field.cpp+++ b/src/tests/common/bit_field.cpp@@ -4,7 +4,7 @@#include <array>#include <cstring>#include <type_traits>-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "common/bit_field.h"TEST_CASE("BitField", "[common]") {diff --git a/src/tests/common/cityhash.cpp b/src/tests/common/cityhash.cppindex 05942eadb4..2a391dff16 100644--- a/src/tests/common/cityhash.cpp+++ b/src/tests/common/cityhash.cpp@@ -1,7 +1,7 @@// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "common/cityhash.h"diff --git a/src/tests/common/fibers.cpp b/src/tests/common/fibers.cppindex 4e29f91996..ecad7583ff 100644--- a/src/tests/common/fibers.cpp+++ b/src/tests/common/fibers.cpp@@ -11,7 +11,7 @@#include <unordered_map>#include <vector>-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "common/common_types.h"#include "common/fiber.h"diff --git a/src/tests/common/host_memory.cpp b/src/tests/common/host_memory.cppindex e49d0a09fb..1b014b6326 100644--- a/src/tests/common/host_memory.cpp+++ b/src/tests/common/host_memory.cpp@@ -1,7 +1,7 @@// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "common/host_memory.h"#include "common/literals.h"diff --git a/src/tests/common/param_package.cpp b/src/tests/common/param_package.cppindex d036cc83a1..41575def44 100644--- a/src/tests/common/param_package.cpp+++ b/src/tests/common/param_package.cpp@@ -1,7 +1,7 @@// SPDX-FileCopyrightText: 2017 Citra Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include <math.h>#include "common/logging/backend.h"#include "common/param_package.h"diff --git a/src/tests/common/range_map.cpp b/src/tests/common/range_map.cppindex 5a4630a381..d301ac5f63 100644--- a/src/tests/common/range_map.cpp+++ b/src/tests/common/range_map.cpp@@ -3,7 +3,7 @@#include <stdexcept>-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "common/range_map.h"diff --git a/src/tests/common/ring_buffer.cpp b/src/tests/common/ring_buffer.cppindex 4f81b6e5e6..7dee988c8d 100644--- a/src/tests/common/ring_buffer.cpp+++ b/src/tests/common/ring_buffer.cpp@@ -7,7 +7,7 @@#include <numeric>#include <thread>#include <vector>-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "common/ring_buffer.h"namespace Common {diff --git a/src/tests/common/scratch_buffer.cpp b/src/tests/common/scratch_buffer.cppindex f6e50da4a4..132f139fa8 100644--- a/src/tests/common/scratch_buffer.cpp+++ b/src/tests/common/scratch_buffer.cpp@@ -5,7 +5,7 @@#include <array>#include <cstring>#include <span>-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "common/common_types.h"#include "common/scratch_buffer.h"diff --git a/src/tests/common/unique_function.cpp b/src/tests/common/unique_function.cppindex 3112725068..f7a23e876d 100644--- a/src/tests/common/unique_function.cpp+++ b/src/tests/common/unique_function.cpp@@ -3,7 +3,7 @@#include <string>-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "common/unique_function.h"diff --git a/src/tests/core/core_timing.cpp b/src/tests/core/core_timing.cppindex 284b2ae66f..f08afbf9ab 100644--- a/src/tests/core/core_timing.cpp+++ b/src/tests/core/core_timing.cpp@@ -1,7 +1,7 @@// SPDX-FileCopyrightText: 2016 Dolphin Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include <array>#include <bitset>diff --git a/src/tests/core/internal_network/network.cpp b/src/tests/core/internal_network/network.cppindex 164b0ff245..10ddd8b426 100644--- a/src/tests/core/internal_network/network.cpp+++ b/src/tests/core/internal_network/network.cpp@@ -1,7 +1,7 @@// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "core/internal_network/network.h"#include "core/internal_network/sockets.h"diff --git a/src/tests/input_common/calibration_configuration_job.cpp b/src/tests/input_common/calibration_configuration_job.cppindex e5f6988867..516ff1b302 100644--- a/src/tests/input_common/calibration_configuration_job.cpp+++ b/src/tests/input_common/calibration_configuration_job.cpp@@ -6,7 +6,7 @@#include <thread>#include <boost/asio.hpp>#include <boost/crc.hpp>-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "input_common/drivers/udp_client.h"#include "input_common/helpers/udp_protocol.h"diff --git a/src/tests/tests.cpp b/src/tests/tests.cppdeleted file mode 100644index 3f905c05ca..0000000000--- a/src/tests/tests.cpp+++ /dev/null@@ -1,8 +0,0 @@-// SPDX-FileCopyrightText: 2016 Citra Emulator Project-// SPDX-License-Identifier: GPL-2.0-or-later--#define CATCH_CONFIG_MAIN-#include <catch2/catch.hpp>--// Catch provides the main function since we've given it the-// CATCH_CONFIG_MAIN preprocessor directive.diff --git a/src/tests/video_core/buffer_base.cpp b/src/tests/video_core/buffer_base.cppindex f7236afabf..734dbf4b69 100644--- a/src/tests/video_core/buffer_base.cpp+++ b/src/tests/video_core/buffer_base.cpp@@ -4,7 +4,7 @@#include <stdexcept>#include <unordered_map>-#include <catch2/catch.hpp>+#include <catch2/catch_test_macros.hpp>#include "common/alignment.h"#include "common/common_types.h"diff --git a/vcpkg.json b/vcpkg.jsonindex 3c92510d60..ef271f778a 100644--- a/vcpkg.json+++ b/vcpkg.json@@ -40,7 +40,7 @@"overrides": [{"name": "catch2",- "version": "2.13.9"+ "version": "3.0.1"},{"name": "fmt",