From: Nicki Křížek <nicki@isc.org>
Date: Tue, 30 Jun 2026 15:00:36 +0000 (+0000)
Subject: Drop the redundant readline configuration check from CI
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb4f8f865500a1cb459eda229fb90f1ede8ba4f9;p=thirdparty%2Fbind9.git

Drop the redundant readline configuration check from CI

.check_readline_setup grepped build/config.h to confirm the requested
libedit/readline backend was actually selected.  It dates to 2020
(bc1c0d2ef4), the autotools era, when several backends
(readline/editline/libedit) were selectable and autoconf's detection
could silently fall back to a different one or to none.

main builds only with meson now, where "line" is a strict feature
option: -Dline=enabled makes libedit a hard dependency (configure fails
if it is missing) and -Dline=disabled guarantees HAVE_LIBEDIT is never
set.  Both assertions the check makes are therefore tautological -- the
silent-misdetection failure mode it guarded against can no longer occur.

Assisted-by: Claude:claude-opus-4-8
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3fbf77b6b6..bb458bddac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -419,16 +419,6 @@ stages:
     - *find_python
     - find -name 'tsan.*' -exec "$PYTHON" "$CI_PROJECT_DIR"/bind9-qa/ci/parse_tsan.py {} \;
 
-.check_readline_setup: &check_readline_setup
-    # WITH_LIBEDIT/WITHOUT_LIBEDIT are always-set global variables, so inspect
-    # the actual per-job configure flags to decide what to assert.
-    - case " ${EXTRA_CONFIGURE} " in
-        *" -Dline=disabled "*)
-          ! grep -e "^#define HAVE_LIBEDIT" build/config.h;;
-        *" -Dline=enabled "*)
-          grep -e "^#define HAVE_LIBEDIT" build/config.h;;
-      esac
-
 .list_installed_package_versions: &list_installed_package_versions
   - echo -e "\e[0Ksection_start:`date +%s`:installed_packages_section[collapsed=true]\r\e[0KHeader of the installed packages collapsible section"
   - ( pip3 list || pip list || echo "no pip" ) 2>/dev/null
@@ -460,7 +450,6 @@ stages:
     - *list_installed_package_versions
   script:
     - *configure
-    - *check_readline_setup
     - meson compile -C build
     - meson compile -C build system-test-dependencies
     - test -z "${RUN_MESON_INSTALL}" || meson install -C build --destdir=$INSTALL_PATH