File tree Expand file tree Collapse file tree 3 files changed +12
-16
lines changed
test/sanitizer_suppressions Expand file tree Collapse file tree 3 files changed +12
-16
lines changed Original file line number Diff line number Diff line change @@ -1011,7 +1011,7 @@ endif
1011
1011
1012
1012
%.cpp.test: %.cpp
1013
1013
@echo Running tests: `cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1` from $<
1014
- $(AM_V_at)$(TEST_BINARY) --catch_system_errors=no -l test_suite -t "`cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1`" > $<.log 2>&1 || (cat $<.log && false)
1014
+ $(AM_V_at)$(TEST_BINARY) --catch_system_errors=no -l test_suite -t "`cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1`" -- DEBUG_LOG_OUT > $<.log 2>&1 || (cat $<.log && false)
1015
1015
1016
1016
%.json.h: %.json
1017
1017
@$(MKDIR_P) $(@D)
Original file line number Diff line number Diff line change 11
11
12
12
#include < test/util/setup_common.h>
13
13
14
- /* * Redirect debug log to boost log */
14
+ #include < iostream>
15
+
16
+ /* * Redirect debug log to unit_test.log files */
15
17
const std::function<void (const std::string&)> G_TEST_LOG_FUN = [](const std::string& s) {
16
- if (s.back () == ' \n ' ) {
17
- // boost will insert the new line
18
- BOOST_TEST_MESSAGE (s.substr (0 , s.size () - 1 ));
19
- } else {
20
- BOOST_TEST_MESSAGE (s);
21
- }
18
+ static const bool should_log{std::any_of (
19
+ &boost::unit_test::framework::master_test_suite ().argv [1 ],
20
+ &boost::unit_test::framework::master_test_suite ().argv [boost::unit_test::framework::master_test_suite ().argc ],
21
+ [](const char * arg) {
22
+ return std::string{" DEBUG_LOG_OUT" } == arg;
23
+ })};
24
+ if (!should_log) return ;
25
+ std::cout << s;
22
26
};
Original file line number Diff line number Diff line change @@ -7,14 +7,6 @@ deadlock:WalletBatch
7
7
# Intentional deadlock in tests
8
8
deadlock:TestPotentialDeadLockDetected
9
9
10
- # Race due to unprotected calls to thread-unsafe BOOST_TEST_MESSAGE from different threads:
11
- # * G_TEST_LOG_FUN in the index thread
12
- # * boost test case invoker (entering a test case) in the main thread
13
- # TODO: get rid of BOOST_ macros, see also https://github.com/bitcoin/bitcoin/issues/8670
14
- race:blockfilter_index_initial_sync_invoker
15
- race:txindex_initial_sync_invoker
16
- race:validation_block_tests::TestSubscriber
17
-
18
10
# Wildcard for all gui tests, should be replaced with non-wildcard suppressions
19
11
race:src/qt/test/*
20
12
deadlock:src/qt/test/*
You can’t perform that action at this time.
0 commit comments