Add --enable-option-checking=fatal to ./configure in CI

The --enable-option-checking=fatal option prevents ./configure from
proceeding when an unknown option is used in the ./configure step in CI.
This change will avoid adding unsupported ./configure options or options
with typo or typo in pairwise testing "# [pairwise: ...]" marker.

(cherry picked from commit 4295c82e457da715eada06cf0d7f4e2c8a788ae4)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9e340337a238c9d52ec72fac61555966736e162..3dc1d77c30cd9d62d08556e59b2a7a2c475095cd 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -222,13 +222,14 @@ stages:
     --with-libtool \
     --with-geoip2=auto \
     --disable-static \
+    --enable-option-checking=fatal \
     --with-cmocka \
     --with-libxml2 \
     --with-libjson \
     --prefix="${BIND_INSTALL_PATH}" \
     --without-make-clean \
     $EXTRA_CONFIGURE \
-    || cat config.log
+    || (test -s config.log && cat config.log; exit 1)
 
 .build: &build_job
   <<: *default_triggering_rules

diff --git a/util/pairwise-testing.sh b/util/pairwise-testing.sh
index d671e4acf7457f1ede52e079f607492b0c565c39..9205b5ec477513f6cdf9734d4b0f92cff05845d3 100755 (executable)
--- a/util/pairwise-testing.sh
+++ b/util/pairwise-testing.sh
@@ -24,8 +24,7 @@ while read -r -a configure_switches; do
        mkdir "pairwise-${runid}"
        cd "pairwise-${runid}"
        echo "${configure_switches[@]}" | tee "../pairwise-output.${runid}.txt"
-       ../configure "${configure_switches[@]}" >> "../pairwise-output.${runid}.txt" 2>&1
-       grep -F "WARNING: unrecognized options:" "../pairwise-output.${runid}.txt" && exit 1
+       ../configure --enable-option-checking=fatal "${configure_switches[@]}" >> "../pairwise-output.${runid}.txt" 2>&1
        make "-j${BUILD_PARALLEL_JOBS:-1}" all >> "../pairwise-output.${runid}.txt" 2>&1
        cd ..
        rm -rf "pairwise-${runid}" "pairwise-output.${runid}.txt"