[med-svn] [Git][med-team/mrbayes][master] 2 commits: Fix timing-dependent MPI completion assertion Closes: #1153613
Andreas Tille (@tille)
gitlab at salsa.debian.org
Tue Nov 10 16:40:18 GMT 2026
Andreas Tille pushed to branch master at Debian Med / mrbayes
Commits:
40c6632f by Andreas Tille at 2026-11-10T15:32:52+01:00
Fix timing-dependent MPI completion assertion Closes: #1153613
- - - - -
0dd4ca87 by Andreas Tille at 2026-11-10T15:35:38+01:00
Upload to unstable
- - - - -
4 changed files:
- debian/changelog
- + debian/patches/29a92f272d12bb06e0d632843a604cd7c674dd0b.patch
- + debian/patches/fix_runtime_wording_test.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mrbayes (3.2.9-2) unstable; urgency=medium
+
+ * Fix timing-dependent MPI completion assertion
+ Closes: #1153613
+
+ -- Andreas Tille <tille at debian.org> Tue, 10 Nov 2026 15:32:58 +0100
+
mrbayes (3.2.9-1) unstable; urgency=medium
* New upstream version
=====================================
debian/patches/29a92f272d12bb06e0d632843a604cd7c674dd0b.patch
=====================================
@@ -0,0 +1,38 @@
+Origin: https://github.com/NBISweden/MrBayes/commit/29a92f272d12bb06e0d632843a604cd7c674dd0b
+From: Copilot <198982749+Copilot at users.noreply.github.com>
+Date: Thu, 15 Oct 2026 16:24:33 +0800
+Bug-Debian: https://bugs.debian.org/1153613
+Subject: [PATCH] Fix timing-dependent MPI completion assertion (#320)
+
+* Initial plan
+
+* Fix timing-dependent analysis completion check in test harness
+
+Co-authored-by: zhangchicool <3209765+zhangchicool at users.noreply.github.com>
+
+---------
+
+Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot at users.noreply.github.com>
+Co-authored-by: zhangchicool <3209765+zhangchicool at users.noreply.github.com>
+---
+ testing/runtests.sh.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/testing/runtests.sh.in b/testing/runtests.sh.in
+index a4dd649c..4be604d2 100644
+--- a/testing/runtests.sh.in
++++ b/testing/runtests.sh.in
+@@ -64,10 +64,10 @@ if (cd "$tmpdir" && "$@" "$pathname") >"$tmpdir/$pathname.out"
+ then ok; else error 'Could not create output...'; fi
+
+ t=$(( t + 1 )); m='Analysis completed'
+-# Analysis completed in N seconds
+-# ... should occur once (N is integer).
++# Analysis completed in any elapsed-time format printed by MrBayes
++# ... should occur once.
+ awk '
+-/Analysis completed in [[:digit:]]+ seconds/ {
++/Analysis completed in (([[:digit:]]+ hours )?([[:digit:]]+ mins )?[[:digit:]]+ seconds|(less than )?1 second)$/ {
+ count++
+ }
+ END {
=====================================
debian/patches/fix_runtime_wording_test.patch
=====================================
@@ -0,0 +1,34 @@
+Description: Accept any runtime duration wording in the analysis-completed test
+ MrBayes prints the MCMC running time in seconds only when it is shorter
+ than 60 s. Longer runs are reported as "N mins M seconds" or as
+ "N hours M mins M seconds", and very short ones as "1 second" or
+ "less than 1 second" (src/mcmc.c). The build-time test
+ 'Analysis completed' insisted on the "<N> seconds" wording, so it failed
+ on every architecture slow enough for the 20000-generation reference runs
+ to exceed a minute, e.g. riscv64:
+ .
+ Did find expected text (count = 0 != 1)
+ .
+ Match the "Analysis completed in" prefix instead. The remaining five
+ tests in the same script pin the actual numerical results, so this
+ keeps a meaningful check without depending on machine speed.
+Author: Andreas Tille <tille at debian.org>
+Last-Update: 2026-11-10
+Assisted-By: aim2balance/a2b-code
+Forwarded: no
+--- a/testing/runtests.sh.in
++++ b/testing/runtests.sh.in
+@@ -65,9 +65,11 @@
+
+ t=$(( t + 1 )); m='Analysis completed'
+ # Analysis completed in N seconds
+-# ... should occur once (N is integer).
++# ... should occur once. On slow architectures MrBayes prints the
++# duration in minutes or hours (or as "less than 1 second"), so do not
++# insist on the seconds wording.
+ awk '
+-/Analysis completed in [[:digit:]]+ seconds/ {
++/Analysis completed in / {
+ count++
+ }
+ END {
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ no_rpath.patch
autoreconf.patch
no_baseline_violation.patch
fix_i386_rate_min_loop.patch
+29a92f272d12bb06e0d632843a604cd7c674dd0b.patch
View it on GitLab: https://salsa.debian.org/med-team/mrbayes/-/compare/3940aff7d3a31613d3a9f13a3fc4270302187253...0dd4ca877eed08b96bdc2b6e66e0cb888dc60ab1
--
View it on GitLab: https://salsa.debian.org/med-team/mrbayes/-/compare/3940aff7d3a31613d3a9f13a3fc4270302187253...0dd4ca877eed08b96bdc2b6e66e0cb888dc60ab1
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261110/60df71ae/attachment-0001.htm>
More information about the debian-med-commit
mailing list