From 0c1c35e77f7919f4e45de951f70f7d318c4ecb24 Mon Sep 17 00:00:00 2001 From: Tomas Halman Date: Jan 23 2023 18:47:40 +0000 Subject: Skip ldap test if ldap server is not available --- diff --git a/tests/default_pw_test b/tests/default_pw_test index 9c76b95..bbf23ac 100755 --- a/tests/default_pw_test +++ b/tests/default_pw_test @@ -29,6 +29,10 @@ trap '(exit 1); exit 1' 1 2 13 15 rm -rf "$workdir" mkdir "$workdir" +if [ ! -x /usr/sbin/slapd ] ; then + have_ldap=no +fi + # Create a SSL key /usr/bin/openssl req -newkey rsa:2048 -keyout "$workdir"/key1 -nodes \ -x509 -days 2 -out "$workdir"/key3 2>/dev/null <>>modules: $modules" >&2 # Set up an LDAP server and database files diff --git a/tests/ldap_test b/tests/ldap_test index c7ac377..3a7bb99 100755 --- a/tests/ldap_test +++ b/tests/ldap_test @@ -19,6 +19,11 @@ # # Author: Miloslav Trmac +if [ ! -x /usr/sbin/slapd ] ; then + echo "The openldap server not found" >&2 + exit 77 +fi + srcdir=$srcdir/tests workdir=$(pwd)/test_ldap