From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 27 May 2026 13:12:07 +0000 (+0200)
Subject: ci: don't build benchmarks in CI
X-Git-Tag: auth-5.1.0~12^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e939bbdb7d07e843a33adee60dba45c4128119ea;p=thirdparty%2Fpdns.git

ci: don't build benchmarks in CI

Catch2 >= 3 is not available in 22.04.
---

diff --git a/tasks.py b/tasks.py
index 9e58d78f8c..9f0db5d57d 100644
--- a/tasks.py
+++ b/tasks.py
@@ -1022,7 +1022,7 @@ DNSDIST_CONFIGURE_CXXFLAGS_LEAST = " ".join(
 
 
 @task
-def ci_dnsdist_configure(c, features, build_dir):
+def ci_dnsdist_configure(c, features, build_dir, benchmark=False):
     additional_flags = ""
     additional_ld_flags = ""
     if is_compiler_clang():
@@ -1031,7 +1031,7 @@ def ci_dnsdist_configure(c, features, build_dir):
     if features == "least":
         additional_flags = DNSDIST_CONFIGURE_CXXFLAGS_LEAST
 
-    cmd = ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flags, build_dir)
+    cmd = ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flags, build_dir, benchmark)
     logfile = "meson-logs/meson-log.txt"
 
     res = c.run(cmd, warn=True)
@@ -1062,7 +1062,6 @@ DNSDIST_CONFIGURE_MESON_FEATURE_SET_FULL = " ".join(
         "-D reproducible=true",
         "-D snmp=enabled",
         "-D yaml=enabled",
-        "-D benchmark=true",
     ]
 )
 
@@ -1092,11 +1091,13 @@ DNSDIST_CONFIGURE_MESON_FEATURE_SET_LEAST = " ".join(
 )
 
 
-def ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flags, build_dir):
+def ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flags, build_dir, benchmark=False):
     if features == "full":
         features_set = DNSDIST_CONFIGURE_MESON_FEATURE_SET_FULL
     else:
         features_set = DNSDIST_CONFIGURE_MESON_FEATURE_SET_LEAST
+    if benchmark:
+        features_set += "-D benchmark=true"
     unittests = get_unit_tests(meson=True)
     fuzztargets = get_fuzzing_targets(meson=True)
     tools = f"""AR=llvm-ar-{clang_version} RANLIB=llvm-ranlib-{clang_version}""" if is_compiler_clang() else ""
@@ -1146,7 +1147,7 @@ def ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flag
     }
 )
 def dev_dnsdist_configure_meson(
-    c, features, build_dir="build", clang=False, ccache=False, unit_tests=False, coverage=False
+    c, features, build_dir="build", clang=False, ccache=False, unit_tests=False, coverage=False, benchmark=False
 ):
     """
     Configures dnsdist using Meson.
@@ -1179,6 +1180,9 @@ def dev_dnsdist_configure_meson(
     else:
         raise KeyError(f'features should be one of "full", "least", not "{features}"')
 
+    if benchmark:
+        features_set += "-D benchmark=true"
+
     if coverage:
         os.environ["COVERAGE"] = "yes"