Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: seq...@packages.debian.org, sanv...@debian.org
Control: affects -1 + src:seqan3
[ Reason ]
This fixes FTBFS Bug #1087373, some tests fail on single-cpu systems.
[ Impact ]
Anybody trying to build the package on a single-cpu system might find
that the package unexpectedly does not build due to failing tests.
[ Tests ]
I've tested that the package builds ok again.
[ Risks ]
Very low. Only some tests have been modified, and the fix comes
directly from the upstream authors after the issue was
forwarded to github.
[ Checklist ]
[X] *all* changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in (old)stable
[X] the issue is verified as fixed in unstable
[ Changes ]
Apply upstream fix for parallel tests.
[ Other info ]
Will wait for confirmation before upload and commit to salsa.
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 17:47:29.000000000 +0100
+++ seqan3-3.2.0+ds/debian/changelog 2024-12-30 18:20:00.000000000 +0100
@@ -1,3 +1,10 @@
+seqan3 (3.2.0+ds-6+deb12u1) bookworm; urgency=medium
+
+ * Team upload.
+ * Fix parallel tests. Closes: #1087373.
+
+ -- Santiago Vila <sanv...@debian.org> 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
01:00:00.000000000 +0100
+++ seqan3-3.2.0+ds/debian/patches/fix-parallel-tests.patch 2024-12-30
18:20:00.000000000 +0100
@@ -0,0 +1,36 @@
+From: Enrico Seiler <enrico.sei...@hotmail.de>
+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 <typename sequential_push_t, typename sequential_pop_t>
+ 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<size_t>(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<size_t> 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<size_t>(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 17:47:29.000000000
+0100
+++ seqan3-3.2.0+ds/debian/patches/series 2024-12-30 18:20:00.000000000
+0100
@@ -5,3 +5,4 @@
debian_cppreference
fix_autopkgtests
a04c764103dd96934d4587130847b480162ce473.patch
+fix-parallel-tests.patch
