From 5c80192ff6b982ee3a75be4142fe942b8206f2cd Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sun, 8 Sep 2024 09:05:39 +0100 Subject: [PATCH] test: Drop no longer needed workarounds `ctest` skips "no test cases matching filter" tests gracefully. --- src/test/CMakeLists.txt | 2 +- src/test/raii_event_tests.cpp | 8 -------- src/test/system_tests.cpp | 7 ------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 4e24b87e9b7..2d34ac44ba9 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -199,7 +199,7 @@ function(add_boost_test source_file) COMMAND test_bitcoin --run_test=${test_suite_name} --catch_system_error=no ) set_property(TEST ${test_suite_name} PROPERTY - SKIP_REGULAR_EXPRESSION "no test cases matching filter" "Skipping" + SKIP_REGULAR_EXPRESSION "no test cases matching filter" ) endif() endfunction() diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp index ada61029ee1..7d1079fbbe9 100644 --- a/src/test/raii_event_tests.cpp +++ b/src/test/raii_event_tests.cpp @@ -86,14 +86,6 @@ BOOST_AUTO_TEST_CASE(raii_event_order) event_set_mem_functions(malloc, realloc, free); } -#else - -BOOST_AUTO_TEST_CASE(raii_event_tests_SKIPPED) -{ - // It would probably be ideal to report skipped, but boost::test doesn't seem to make that practical (at least not in versions available with common distros) - BOOST_TEST_MESSAGE("Skipping raii_event_tess: libevent doesn't support event_set_mem_functions"); -} - #endif // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp index 07d15f5552b..bf50a61327d 100644 --- a/src/test/system_tests.cpp +++ b/src/test/system_tests.cpp @@ -16,13 +16,6 @@ BOOST_FIXTURE_TEST_SUITE(system_tests, BasicTestingSetup) -// At least one test is required (in case ENABLE_EXTERNAL_SIGNER is not defined). -// Workaround for https://github.com/bitcoin/bitcoin/issues/19128 -BOOST_AUTO_TEST_CASE(dummy) -{ - BOOST_CHECK(true); -} - #ifdef ENABLE_EXTERNAL_SIGNER BOOST_AUTO_TEST_CASE(run_command)