Skip to content

Commit e939bbd

Browse files
committed
ci: don't build benchmarks in CI
Catch2 >= 3 is not available in 22.04.
1 parent f2ebef9 commit e939bbd

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

tasks.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ def ci_rec_configure(c, features, build_dir=None, meson=False):
10221022

10231023

10241024
@task
1025-
def ci_dnsdist_configure(c, features, build_dir):
1025+
def ci_dnsdist_configure(c, features, build_dir, benchmark=False):
10261026
additional_flags = ""
10271027
additional_ld_flags = ""
10281028
if is_compiler_clang():
@@ -1031,7 +1031,7 @@ def ci_dnsdist_configure(c, features, build_dir):
10311031
if features == "least":
10321032
additional_flags = DNSDIST_CONFIGURE_CXXFLAGS_LEAST
10331033

1034-
cmd = ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flags, build_dir)
1034+
cmd = ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flags, build_dir, benchmark)
10351035
logfile = "meson-logs/meson-log.txt"
10361036

10371037
res = c.run(cmd, warn=True)
@@ -1062,7 +1062,6 @@ def ci_dnsdist_configure(c, features, build_dir):
10621062
"-D reproducible=true",
10631063
"-D snmp=enabled",
10641064
"-D yaml=enabled",
1065-
"-D benchmark=true",
10661065
]
10671066
)
10681067

@@ -1092,11 +1091,13 @@ def ci_dnsdist_configure(c, features, build_dir):
10921091
)
10931092

10941093

1095-
def ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flags, build_dir):
1094+
def ci_dnsdist_configure_meson(c, features, additional_flags, additional_ld_flags, build_dir, benchmark=False):
10961095
if features == "full":
10971096
features_set = DNSDIST_CONFIGURE_MESON_FEATURE_SET_FULL
10981097
else:
10991098
features_set = DNSDIST_CONFIGURE_MESON_FEATURE_SET_LEAST
1099+
if benchmark:
1100+
features_set += "-D benchmark=true"
11001101
unittests = get_unit_tests(meson=True)
11011102
fuzztargets = get_fuzzing_targets(meson=True)
11021103
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
11461147
}
11471148
)
11481149
def dev_dnsdist_configure_meson(
1149-
c, features, build_dir="build", clang=False, ccache=False, unit_tests=False, coverage=False
1150+
c, features, build_dir="build", clang=False, ccache=False, unit_tests=False, coverage=False, benchmark=False
11501151
):
11511152
"""
11521153
Configures dnsdist using Meson.
@@ -1179,6 +1180,9 @@ def dev_dnsdist_configure_meson(
11791180
else:
11801181
raise KeyError(f'features should be one of "full", "least", not "{features}"')
11811182

1183+
if benchmark:
1184+
features_set += "-D benchmark=true"
1185+
11821186
if coverage:
11831187
os.environ["COVERAGE"] = "yes"
11841188

0 commit comments

Comments
 (0)