commit: b88bedd14cd548acfdbabb96a4300522db9f2109 Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com> AuthorDate: Sat Apr 15 19:33:59 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Apr 26 04:02:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88bedd1
dev-cpp/doctest: add patch for tests with clock resolution problems See: https://github.com/doctest/doctest/pull/770 See: https://github.com/doctest/doctest/issues/711 Bug: https://bugs.gentoo.org/874345 Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com> Closes: https://github.com/gentoo/gentoo/pull/30607 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/doctest/doctest-2.4.11.ebuild | 1 + .../files/doctest-2.4.11-backport-pr770.patch | 72 ++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/dev-cpp/doctest/doctest-2.4.11.ebuild b/dev-cpp/doctest/doctest-2.4.11.ebuild index fa399178375b..c3a3b788415c 100644 --- a/dev-cpp/doctest/doctest-2.4.11.ebuild +++ b/dev-cpp/doctest/doctest-2.4.11.ebuild @@ -14,6 +14,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}/${PN}-2.4.11-backport-pr770.patch" ) src_prepare() { sed -i '/-Werror/d' scripts/cmake/common.cmake || die diff --git a/dev-cpp/doctest/files/doctest-2.4.11-backport-pr770.patch b/dev-cpp/doctest/files/doctest-2.4.11-backport-pr770.patch new file mode 100644 index 000000000000..eb1f8625d34e --- /dev/null +++ b/dev-cpp/doctest/files/doctest-2.4.11-backport-pr770.patch @@ -0,0 +1,72 @@ +https://bugs.gentoo.org/874345 +https://github.com/doctest/doctest/pull/770 +https://github.com/doctest/doctest/issues/711 + +commit 1ffb66bff7533f7ea42d801facf1b87d72621ac5 +Author: matoro <mat...@users.noreply.github.com> +Date: Sat Apr 15 11:15:25 2023 -0400 + + Add sleep of one clock-resolution to test which should trigger timeout + + Fixes https://github.com/doctest/doctest/issues/711 under HPPA, and + partially under alpha. + +diff --git a/examples/all_features/CMakeLists.txt b/examples/all_features/CMakeLists.txt +index ebc75c2..4556227 100644 +--- a/examples/all_features/CMakeLists.txt ++++ b/examples/all_features/CMakeLists.txt +@@ -39,6 +39,12 @@ set(files_all + # add the executable + add_executable(all_features ${files_all}) + target_link_libraries(all_features doctest ${CMAKE_THREAD_LIBS_INIT}) ++if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ target_link_options(all_features PRIVATE "-rtlib=compiler-rt") ++ if(LINUX) ++ target_link_libraries(all_features "-lgcc_s") ++ endif() ++endif() + + # easy way to fix test coverage - disable colors and crash handling + target_compile_definitions(all_features PRIVATE +@@ -124,6 +130,12 @@ function(add_test_all_features test_name flags) + add_executable(${test_name} ${files_with_output}) + target_compile_definitions(${test_name} PRIVATE ${flags}) + target_link_libraries(${test_name} doctest ${CMAKE_THREAD_LIBS_INIT}) ++ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ target_link_options(${test_name} PRIVATE "-rtlib=compiler-rt") ++ if(LINUX) ++ target_link_libraries(${test_name} "-lgcc_s") ++ endif() ++ endif() + + doctest_add_test_impl(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}> --no-skipped-summary --no-version -ob=name) + endfunction() +diff --git a/examples/all_features/test_cases_and_suites.cpp b/examples/all_features/test_cases_and_suites.cpp +index 13b316d..d87f2fd 100644 +--- a/examples/all_features/test_cases_and_suites.cpp ++++ b/examples/all_features/test_cases_and_suites.cpp +@@ -2,6 +2,12 @@ + + #include "header.h" + ++DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN ++#include <chrono> ++#include <ctime> ++#include <thread> ++DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END ++ + static int doStuff() { + int a = 5; + a += 2; +@@ -46,6 +52,11 @@ TEST_CASE_FIXTURE(SomeFixture, "fixtured test - not part of a test suite") { + + TEST_CASE("normal test in a test suite from a decorator" * doctest::test_suite("ts1") * + doctest::timeout(0.000001)) { ++#ifndef _WIN32 ++ struct timespec res{}; ++ clock_getres(CLOCK_MONOTONIC, &res); ++ std::this_thread::sleep_for(std::chrono::nanoseconds(res.tv_nsec)); ++#endif + MESSAGE("failing because of the timeout decorator!"); + } +
