Avoid negative test-builds.sh results due to lack of LDAP (#1158)

    TESTING: layer-02-maximus
    BUILD: test-suite/buildtests/layer-02-maximus.opts
    configure: error: Required library ldap not found

Broken by commit 0d57ed2.

diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
index 2b078abdbd25b071a2a96370ceb4073b84528c3d..8e69cf0ab918b9cfa8fca4658fe13e4262ad703b 100644 (file)
--- a/.github/workflows/default.yaml
+++ b/.github/workflows/default.yaml
@@ -105,7 +105,6 @@ jobs:
           sudo apt-get --quiet=2 update
           sudo apt-get --quiet=2 install libtool-bin
           sudo apt-get --quiet=2 install libcppunit-dev
-          sudo apt-get --quiet=2 install libldap2-dev
           # TODO: Add some deb-src URI to sources.list and do build-dep
           # instead of the above installs?
           # sudo apt-get --quiet=2 build-dep squid

diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index c24cfd72ce33097000c8c1ab2b93cf3cc879e3b4..22874e9723a4263e7c4eb3d3838c00a2a8b4f0ab 100644 (file)
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -48,6 +48,7 @@ MAKETEST="distcheck"
 #   --with-gnugss \
 #   --with-heimdal-krb5 \
 #   --with-mit-krb5 \
+#   --with-ldap \
 #
 #   --enable-cpu-profiling \  Requires CPU support.
 #
@@ -111,7 +112,6 @@ DISTCHECK_CONFIGURE_FLAGS=" \
        --with-gnu-ld \
        --with-ipv6-split-stack \
        --with-large-files \
-       --with-ldap \
        --with-pic \
        --with-pthreads \
        --enable-build-info=squid\ test\ build \

diff --git a/test-suite/buildtests/layer-04-noauth-everything.opts b/test-suite/buildtests/layer-04-noauth-everything.opts
index b01df312edf9fbdbcd4a01debcdd98dae5188cb0..34972050f82f4945bd56f822547a4307c7f166f2 100644 (file)
--- a/test-suite/buildtests/layer-04-noauth-everything.opts
+++ b/test-suite/buildtests/layer-04-noauth-everything.opts
@@ -47,6 +47,7 @@ MAKETEST="distcheck"
 #   --enable-kqueue \
 #   --enable-win32-service \
 #   --with-valgrind-debug \
+#   --with-ldap \
 #
 #   --enable-cpu-profiling \  Requires CPU support.
 #
@@ -113,7 +114,6 @@ DISTCHECK_CONFIGURE_FLAGS=" \
        --with-gnu-ld \
        --with-ipv6-split-stack \
        --with-large-files \
-       --with-ldap \
        --with-pic \
        --with-pthreads \
        --enable-build-info=squid\ test\ build \