diff --git a/blocks/basic/test/qa_DataSink.cpp b/blocks/basic/test/qa_DataSink.cpp index 6ae5d96fc..e2da30104 100644 --- a/blocks/basic/test/qa_DataSink.cpp +++ b/blocks/basic/test/qa_DataSink.cpp @@ -18,12 +18,6 @@ using namespace std::chrono_literals; -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - template<> struct fmt::formatter { template diff --git a/blocks/basic/test/qa_sources.cpp b/blocks/basic/test/qa_sources.cpp index 91778f1fe..91290b079 100644 --- a/blocks/basic/test/qa_sources.cpp +++ b/blocks/basic/test/qa_sources.cpp @@ -11,12 +11,6 @@ #include #include -#if defined(__clang__) && __clang_major__ >= 15 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - template constexpr void addTimeTagEntry(gr::basic::ClockSource &clockSource, std::uint64_t timeInNanoseconds, const std::string &value) { diff --git a/blocks/filter/test/qa_filter.cpp b/blocks/filter/test/qa_filter.cpp index 5dbef4a27..2953bddf4 100644 --- a/blocks/filter/test/qa_filter.cpp +++ b/blocks/filter/test/qa_filter.cpp @@ -6,12 +6,6 @@ #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - template requires std::floating_point constexpr size_t diff --git a/blocks/fourier/test/qa_fourier.cpp b/blocks/fourier/test/qa_fourier.cpp index 5f116ffd3..030c13b65 100644 --- a/blocks/fourier/test/qa_fourier.cpp +++ b/blocks/fourier/test/qa_fourier.cpp @@ -15,12 +15,6 @@ #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - template std::vector generateSinSample(std::size_t N, double sample_rate, double frequency, double amplitude) { diff --git a/blocks/http/test/qa_HttpBlock.cpp b/blocks/http/test/qa_HttpBlock.cpp index 378cc3145..82a06604b 100644 --- a/blocks/http/test/qa_HttpBlock.cpp +++ b/blocks/http/test/qa_HttpBlock.cpp @@ -13,12 +13,6 @@ #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - template class FixedSource : public gr::Block> { using super_t = gr::Block>; diff --git a/blocks/testing/test/qa_UI_Integration.cpp b/blocks/testing/test/qa_UI_Integration.cpp index 2ee4b7b90..c9d448533 100644 --- a/blocks/testing/test/qa_UI_Integration.cpp +++ b/blocks/testing/test/qa_UI_Integration.cpp @@ -11,12 +11,6 @@ #include "gnuradio-4.0/testing/ImChartMonitor.hpp" #include "gnuradio-4.0/testing/TagMonitors.hpp" -#if defined(__clang__) && __clang_major__ >= 15 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - const boost::ut::suite TagTests = [] { using namespace boost::ut; using namespace gr; diff --git a/core/test/qa_Block.cpp b/core/test/qa_Block.cpp index 43a44b26c..3b61c3c97 100644 --- a/core/test/qa_Block.cpp +++ b/core/test/qa_Block.cpp @@ -10,12 +10,6 @@ #include #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - #if !DISABLE_SIMD namespace gr::test { struct copy : public Block { diff --git a/core/test/qa_DynamicPort.cpp b/core/test/qa_DynamicPort.cpp index 17edd1bf8..8adefe0e9 100644 --- a/core/test/qa_DynamicPort.cpp +++ b/core/test/qa_DynamicPort.cpp @@ -8,12 +8,6 @@ #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - using namespace std::string_literals; #ifdef ENABLE_DYNAMIC_PORTS diff --git a/core/test/qa_Messages.cpp b/core/test/qa_Messages.cpp index 4f019e563..eae205f2b 100644 --- a/core/test/qa_Messages.cpp +++ b/core/test/qa_Messages.cpp @@ -10,12 +10,6 @@ #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - using namespace std::chrono_literals; using namespace std::string_literals; diff --git a/core/test/qa_Scheduler.cpp b/core/test/qa_Scheduler.cpp index b3e3e9aa3..d37c69645 100644 --- a/core/test/qa_Scheduler.cpp +++ b/core/test/qa_Scheduler.cpp @@ -2,12 +2,6 @@ #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - using TraceVectorType = std::vector; class Tracer { diff --git a/core/test/qa_Settings.cpp b/core/test/qa_Settings.cpp index c64ceb169..d8a27ada3 100644 --- a/core/test/qa_Settings.cpp +++ b/core/test/qa_Settings.cpp @@ -17,12 +17,6 @@ using namespace std::string_literals; -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - namespace gr::setting_test { namespace utils { diff --git a/core/test/qa_Tags.cpp b/core/test/qa_Tags.cpp index 429025f1c..f505ca754 100644 --- a/core/test/qa_Tags.cpp +++ b/core/test/qa_Tags.cpp @@ -32,12 +32,6 @@ static_assert(HasRequiredProcessFunction>); } // namespace gr::testing -#if defined(__clang__) && __clang_major__ >= 15 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - const boost::ut::suite TagTests = [] { using namespace boost::ut; using namespace gr; diff --git a/core/test/qa_buffer.cpp b/core/test/qa_buffer.cpp index fc33861c8..3d290ba0d 100644 --- a/core/test/qa_buffer.cpp +++ b/core/test/qa_buffer.cpp @@ -17,12 +17,6 @@ #include #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - template struct TestStruct { [[nodiscard]] constexpr bool diff --git a/core/test/qa_grc.cpp b/core/test/qa_grc.cpp index 086ee9152..230371e19 100644 --- a/core/test/qa_grc.cpp +++ b/core/test/qa_grc.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -16,7 +15,7 @@ #include #if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection +// for clang there seems to be some static initialisation problem which leads to segfaults in gr::registerBlock template<> auto boost::ut::cfg = boost::ut::runner>{}; #endif diff --git a/core/test/qa_plugins_test.cpp b/core/test/qa_plugins_test.cpp index 938634159..bd7a439b8 100644 --- a/core/test/qa_plugins_test.cpp +++ b/core/test/qa_plugins_test.cpp @@ -10,12 +10,6 @@ #include #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - using namespace std::chrono_literals; template diff --git a/core/test/qa_reader_writer_lock.cpp b/core/test/qa_reader_writer_lock.cpp index 54924178d..bfa465191 100644 --- a/core/test/qa_reader_writer_lock.cpp +++ b/core/test/qa_reader_writer_lock.cpp @@ -2,12 +2,6 @@ #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - namespace gr::reader_writer_lock_test { const boost::ut::suite basicTests = [] { diff --git a/core/test/qa_thread_affinity.cpp b/core/test/qa_thread_affinity.cpp index 14fb7916b..2be3deea8 100644 --- a/core/test/qa_thread_affinity.cpp +++ b/core/test/qa_thread_affinity.cpp @@ -4,12 +4,6 @@ #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - const boost::ut::suite ThreadAffinityTests = [] { using namespace boost::ut; diff --git a/core/test/qa_thread_pool.cpp b/core/test/qa_thread_pool.cpp index ad379201c..8ad5b047b 100644 --- a/core/test/qa_thread_pool.cpp +++ b/core/test/qa_thread_pool.cpp @@ -2,12 +2,6 @@ #include -#if defined(__clang__) && __clang_major__ >= 16 -// clang 16 does not like ut's default reporter_junit due to some issues with stream buffers and output redirection -template<> -auto boost::ut::cfg = boost::ut::runner>{}; -#endif - const boost::ut::suite ThreadPoolTests = [] { using namespace boost::ut;