Version in base suite: 3.2.0+ds-6 Base version: seqan3_3.2.0+ds-6 Target version: seqan3_3.2.0+ds-6+deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/s/seqan3/seqan3_3.2.0+ds-6.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/s/seqan3/seqan3_3.2.0+ds-6+deb12u1.dsc changelog | 7 +++++++ patches/fix-parallel-tests.patch | 36 ++++++++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 44 insertions(+) diff -Nru seqan3-3.2.0+ds/debian/changelog seqan3-3.2.0+ds/debian/changelog --- seqan3-3.2.0+ds/debian/changelog 2022-12-05 16:47:29.000000000 +0000 +++ seqan3-3.2.0+ds/debian/changelog 2024-12-30 17:20:00.000000000 +0000 @@ -1,3 +1,10 @@ +seqan3 (3.2.0+ds-6+deb12u1) bookworm; urgency=medium + + * Team upload. + * Fix parallel tests. Closes: #1087373. + + -- Santiago Vila Mon, 30 Dec 2024 18:20:00 +0100 + seqan3 (3.2.0+ds-6) unstable; urgency=medium * Team upload. diff -Nru seqan3-3.2.0+ds/debian/patches/fix-parallel-tests.patch seqan3-3.2.0+ds/debian/patches/fix-parallel-tests.patch --- seqan3-3.2.0+ds/debian/patches/fix-parallel-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ seqan3-3.2.0+ds/debian/patches/fix-parallel-tests.patch 2024-12-30 17:20:00.000000000 +0000 @@ -0,0 +1,36 @@ +From: Enrico Seiler +Subject: Fix parallel tests +Origin: upstream, https://github.com/seqan/seqan3/commit/54e011dd8e2190543f8bca2c0cba097d5dd5cb75 +Bug-Debian: https://bugs.debian.org/1087373 +Last-Update: 2024-11-13 + +--- a/test/unit/contrib/parallel/buffer_queue_parallel_test.cpp ++++ b/test/unit/contrib/parallel/buffer_queue_parallel_test.cpp +@@ -18,11 +18,8 @@ + template + void test_buffer_queue_wait_status() + { +- size_t thread_count = std::thread::hardware_concurrency(); +- +- // limit thread count as virtualbox (used by Travis) seems to have problems with thread congestion +- if (thread_count > 4) +- thread_count = 4; ++ // At least two threads (one producer and one consumer), at most 4 threads (avoid congestion). ++ size_t thread_count = std::clamp(std::thread::hardware_concurrency(), 2u, 4u); + + size_t writer_count = thread_count / 2; + if constexpr (sequential_push_t::value) +@@ -132,11 +129,9 @@ + } + + volatile std::atomic chk_sum2 = 0; +- size_t thread_count = std::thread::hardware_concurrency(); + +- // limit thread count as virtualbox (used by Travis) seems to have problems with thread congestion +- if (thread_count > 4) +- thread_count = 4; ++ // At least two threads (one producer and one consumer), at most 4 threads (avoid congestion). ++ size_t thread_count = std::clamp(std::thread::hardware_concurrency(), 2u, 4u); + + size_t writer_count = thread_count / 2; + if constexpr (sequential_push_t::value) diff -Nru seqan3-3.2.0+ds/debian/patches/series seqan3-3.2.0+ds/debian/patches/series --- seqan3-3.2.0+ds/debian/patches/series 2022-12-05 16:47:29.000000000 +0000 +++ seqan3-3.2.0+ds/debian/patches/series 2024-12-30 17:20:00.000000000 +0000 @@ -5,3 +5,4 @@ debian_cppreference fix_autopkgtests a04c764103dd96934d4587130847b480162ce473.patch +fix-parallel-tests.patch