From 5678fd520608b1ce35282dd80e4ce426535b3fbd Mon Sep 17 00:00:00 2001 From: not-matthias Date: Tue, 26 May 2026 11:59:32 +0200 Subject: [PATCH 1/2] fix(version): include codspeed iteration in --version output Derive v_suffix_ver in configure.ac from the top entry of debian/changelog so AC_INIT picks up the codspeedN iteration automatically, and join it with '-' to match the git-tag / deb-version format. Before: valgrind-3.26.0.codspeed After: valgrind-3.26.0-codspeed2 --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f3f3867ef..e55a3d3b1 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,11 @@ m4_define([v_major_ver], [3]) m4_define([v_minor_ver], [26]) m4_define([v_micro_ver], [0]) m4_define([v_suffix_ver], []) -m4_define([v_suffix_ver], [codspeed]) +m4_define([v_suffix_ver], + m4_esyscmd_s([sed -n '1s/.*-[0-9]*\(codspeed[0-9]*\).*/\1/p' debian/changelog])) +m4_if(m4_bregexp(v_suffix_ver, [^codspeed[0-9]+$]), [-1], + [m4_fatal([invalid codspeed suffix ']v_suffix_ver[' extracted from debian/changelog])]) + m4_define([v_rel_date], ["5 Nov 2025"]) m4_define([v_version], m4_if(v_suffix_ver, [], From 4a64bb2053329ba9909f116d1d817a5c87cf561d Mon Sep 17 00:00:00 2001 From: not-matthias Date: Tue, 26 May 2026 12:15:05 +0200 Subject: [PATCH 2/2] fix(bench): match new codspeed version format for stable test URIs The check looked for '.codspeed' but the version separator is now '-' (e.g. valgrind-3.26.0-codspeed2), so the iteration leaked into test IDs and broke comparison against historical runs. Match the plain 'codspeed' substring so both old and new formats normalize to 'valgrind.codspeed'. --- bench/bench.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bench/bench.py b/bench/bench.py index 18e2c472a..6f525d435 100755 --- a/bench/bench.py +++ b/bench/bench.py @@ -119,7 +119,7 @@ def pytest_generate_tests(metafunc): # If the valgrind version is from CodSpeed, we don't want to display the exact version # to allow comparison against older versions. - if ".codspeed" in runner.valgrind_version: + if "codspeed" in runner.valgrind_version: runner.valgrind_version = "valgrind.codspeed" # Create test IDs with format: valgrind-version, command, config-name