Skip to content

Commit 85833cf

Browse files
committed
Merge bitcoin/bitcoin#30847: test: Drop no longer needed workarounds
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
2 parents 11e2f9f + 5c80192 commit 85833cf

File tree

3 files changed

+1
-16
lines changed

3 files changed

+1
-16
lines changed

src/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ function(add_boost_test source_file)
199199
COMMAND test_bitcoin --run_test=${test_suite_name} --catch_system_error=no --log_level=test_suite -- DEBUG_LOG_OUT
200200
)
201201
set_property(TEST ${test_suite_name} PROPERTY
202-
SKIP_REGULAR_EXPRESSION "no test cases matching filter" "Skipping"
202+
SKIP_REGULAR_EXPRESSION "no test cases matching filter"
203203
)
204204
endif()
205205
endfunction()

src/test/raii_event_tests.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@ BOOST_AUTO_TEST_CASE(raii_event_order)
8686
event_set_mem_functions(malloc, realloc, free);
8787
}
8888

89-
#else
90-
91-
BOOST_AUTO_TEST_CASE(raii_event_tests_SKIPPED)
92-
{
93-
// 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)
94-
BOOST_TEST_MESSAGE("Skipping raii_event_tess: libevent doesn't support event_set_mem_functions");
95-
}
96-
9789
#endif // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
9890

9991
BOOST_AUTO_TEST_SUITE_END()

src/test/system_tests.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616

1717
BOOST_FIXTURE_TEST_SUITE(system_tests, BasicTestingSetup)
1818

19-
// At least one test is required (in case ENABLE_EXTERNAL_SIGNER is not defined).
20-
// Workaround for https://github.com/bitcoin/bitcoin/issues/19128
21-
BOOST_AUTO_TEST_CASE(dummy)
22-
{
23-
BOOST_CHECK(true);
24-
}
25-
2619
#ifdef ENABLE_EXTERNAL_SIGNER
2720

2821
BOOST_AUTO_TEST_CASE(run_command)

0 commit comments

Comments
 (0)