chore: update Catch2 to v3

Bionus · Jan 8, 2023 · ecec471 · ecec471
1 parent a5e9ded
commit ecec471
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -14,6 +14,7 @@ coverage:
   ignore:
     - "build/**/*"
     - "src/tests/**/*"
+    - "src/*/tests/*"
     - "src/*/tests/**/*"
     - "src/e2e/**/*"
     - "src/gui-qml/**/*"

diff --git a/.gitmodules b/.gitmodules
@@ -7,7 +7,7 @@
 [submodule "tests/src/vendor/catch"]
 	path = src/tests/vendor/catch
 	url = https://github.com/catchorg/Catch2.git
-	branch = v2.x
+	branch = devel
 [submodule "lib/vendor/lexbor"]
 	path = src/lib/vendor/lexbor
 	url = https://github.com/lexbor/lexbor.git
diff --git a/src/cli/tests/CMakeLists.txt b/src/cli/tests/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(${PROJECT_NAME} PUBLIC "." "../../tests/" "../../tests/src/"
 # Executable
 add_executable(${PROJECT_NAME} ${SOURCES} ${FORMS} ${UTILS_SOURCES} ${SOURCES_TESTS})
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${LIBS} lib)
+target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${LIBS} lib Catch2::Catch2)
 
 # Pre-compiled header
 if(USE_PCH)

diff --git a/src/crash-reporter/tests/CMakeLists.txt b/src/crash-reporter/tests/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(${PROJECT_NAME} PUBLIC "." "../../lib/src/" "../../tests/" "
 # Executable
 add_executable(${PROJECT_NAME} ${SOURCES} ${FORMS} ${UTILS_SOURCES} ${SOURCES_TESTS})
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${LIBS} lib)
+target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${LIBS} lib Catch2::Catch2)
 
 # Pre-compiled header
 if(USE_PCH)

diff --git a/src/gui/tests/CMakeLists.txt b/src/gui/tests/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(${PROJECT_NAME} PUBLIC "." "../../tests/" "../../tests/src/"
 # Executable
 add_executable(${PROJECT_NAME} ${SOURCES} ${FORMS} ${UTILS_SOURCES} ${SOURCES_TESTS})
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${LIBS} lib)
+target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${LIBS} lib Catch2::Catch2)
 
 # Pre-compiled header
 if(USE_PCH)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -14,9 +14,10 @@ include_directories("src/" "src/common/" "." "../lib/src/" "../lib/vendor/lexbor
 
 add_executable(${PROJECT_NAME} ${SOURCES})
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} lib)
+target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} lib Catch2::Catch2)
 
 add_subdirectory(languages)
+add_subdirectory(vendor/catch)
 
 # Pre-compiled header
 if(USE_PCH)

diff --git a/src/tests/src/common/catch.h b/src/tests/src/common/catch.h
@@ -4,7 +4,7 @@
 #include <QString>
 #include <QUrl>
 #include <string>
-#include "vendor/catch/single_include/catch2/catch.hpp"
+#include "vendor/catch/src/catch2/catch_all.hpp"
 
 
 namespace Catch

diff --git a/src/tests/src/common/main.cpp b/src/tests/src/common/main.cpp
@@ -1,12 +1,10 @@
-#define CATCH_CONFIG_RUNNER
-
 #ifdef HEADLESS
 	#include <QCoreApplication>
 #else
 	#include <QApplication>
 #endif
 #include "functions.h"
-#include "vendor/catch/single_include/catch2/catch.hpp"
+#include "vendor/catch/src/catch2/catch_all.hpp"
 
 
 int main(int argc, char* argv[])

diff --git a/src/tests/vendor/catch b/src/tests/vendor/catch