Merge pull request #19 from red0124/improvement/doctest_update

Make project used forked doctest
This commit is contained in:
red0124 2023-02-12 12:38:34 +01:00 committed by GitHub
commit a9e9783e6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions

View File

@ -5,7 +5,7 @@ BUILD_TYPE=Debug
set -eux
git clone https://github.com/onqtam/doctest -b 2.4.4 --depth 1
git clone https://github.com/red0124/doctest -b master --depth 1
cmake -S doctest -B doctest/build \
-D CMAKE_BUILD_TYPE=${BUILD_TYPE} \

View File

@ -1,3 +1,3 @@
[wrap-git]
url = https://github.com/onqtam/doctest
revision = v2.4.9
url = https://github.com/red0124/doctest
revision = master

View File

@ -4,11 +4,6 @@ project(ssp_tests CXX)
# ---- Dependencies ----
set(SSP_INCLUDE_WITHOUT_SYSTEM YES
CACHE INTERNAL
"Turn the warning guard off to have errors appear in test builds"
)
include(FetchContent)
fetchcontent_declare(ssp SOURCE_DIR "${PROJECT_SOURCE_DIR}/..")
fetchcontent_makeavailable(ssp)
@ -17,9 +12,16 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
target_compile_options(ssp INTERFACE -Wall -Wextra)
endif()
find_package(doctest 2.4.4 CONFIG REQUIRED)
# for doctest_discover_tests
include(doctest)
include(FetchContent)
fetchcontent_declare(
DOCTEST
GIT_REPOSITORY https://github.com/red0124/doctest
GIT_TAG origin/master
GIT_SHALLOW TRUE
)
fetchcontent_makeavailable(DOCTEST)
set(DOCTEST "${FETCHCONTENT_BASE_DIR}/doctest-src")
# ---- Test ----
@ -35,5 +37,5 @@ foreach(name IN ITEMS test_splitter test_parser test_converter test_extractions)
"${name}"
PRIVATE DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN CMAKE_GITHUB_CI
)
doctest_discover_tests("${name}")
add_test(NAME "${name}" COMMAND "${name}")
endforeach()