Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#30847: test: Drop no longer needed workarounds
Browse files Browse the repository at this point in the history
5c80192 test: Drop no longer needed workarounds (Hennadii Stepanov)

Pull request description:

  This PR deletes the workarounds introduced in bitcoin/bitcoin#16564 and bitcoin/bitcoin#15382, as `ctest` skips these cases gracefully: https://github.com/bitcoin/bitcoin/blob/5c80192ff6b982ee3a75be4142fe942b8206f2cd/src/test/CMakeLists.txt#L201-L203

ACKs for top commit:
  kevkevinpal:
    ACK [5c80192](bitcoin/bitcoin@5c80192)
  fanquake:
    ACK 5c80192. Looks correct:

Tree-SHA512: c47c606ecf7d64016b3c6353c3d4898350edc2caeac494dfd44484417f500a73f0c88c39f0f24651f3a02ef31ed9ca5c70d938bb9a8ca1eea54927e4d6a8fcd2
  • Loading branch information
fanquake committed Sep 12, 2024
2 parents 11e2f9f + 5c80192 commit 85833cf
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 16 deletions.
2 changes: 1 addition & 1 deletion src/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ function(add_boost_test source_file)
COMMAND test_bitcoin --run_test=${test_suite_name} --catch_system_error=no --log_level=test_suite -- DEBUG_LOG_OUT
)
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()
Expand Down
8 changes: 0 additions & 8 deletions src/test/raii_event_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
7 changes: 0 additions & 7 deletions src/test/system_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 85833cf

Please sign in to comment.