Improve check in LDAP test to find the OpenLDAP installation

If the OpenLDAP installation directory is not found, set $setup to 0
so that the LDAP tests are skipped. The macOS checks were already
doing that, but the checks on other OS's were not. While we're at it,
improve the error message when the tests are skipped, to specify
whether the OS is supported at all, or if we just didn't find the
installation directory.

This was accidentally "working" without this, i.e. we were skipping
the tests if the OpenLDAP installation was not found, because of a bug
in the LdapServer test module: the END block clobbered the exit code
so if the script die()s before running the first subtest, the whole
test script was marked as SKIPped. The next commit will fix that bug,
but we need to fix the setup code first.

These checks should probably go into configure/meson, but this is
better than nothing and allows fixing the bug in the END block.

Backpatch to all supported versions.

Discussion: https://www.postgresql.org/message-id/fb898a70-3a88-4629-88e9-f2375020061d@iki.fi

diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
index f5c6181d817b1bb14386326d32dd71791e6ba368..850b28f20f8065d02cfdf7e79c39d5db463fdada 100644 (file)
--- a/src/test/ldap/t/001_auth.pl
+++ b/src/test/ldap/t/001_auth.pl
@@ -4,47 +4,73 @@ use TestLib;
 use PostgresNode;
 use Test::More;
 
-if ($ENV{with_ldap} eq 'yes')
-{
-   plan tests => 22;
-}
-else
-{
-   plan skip_all => 'LDAP not supported by this build';
-}
-
 my ($slapd, $ldap_bin_dir, $ldap_schema_dir);
 
 $ldap_bin_dir = undef;    # usually in PATH
 
-if ($^O eq 'darwin' && -d '/opt/homebrew/opt/openldap')
+if ($ENV{with_ldap} ne 'yes')
 {
-   # typical paths for Homebrew on ARM
-   $slapd           = '/opt/homebrew/opt/openldap/libexec/slapd';
-   $ldap_schema_dir = '/opt/homebrew/etc/openldap/schema';
-}
-elsif ($^O eq 'darwin' && -d '/usr/local/opt/openldap')
-{
-   # typical paths for Homebrew on Intel
-   $slapd           = '/usr/local/opt/openldap/libexec/slapd';
-   $ldap_schema_dir = '/usr/local/etc/openldap/schema';
+   plan skip_all => 'LDAP not supported by this build';
 }
-elsif ($^O eq 'darwin' && -d '/opt/local/etc/openldap')
+# Find the OpenLDAP server binary and directory containing schema
+# definition files.
+elsif ($^O eq 'darwin')
 {
-   # typical paths for MacPorts
-   $slapd           = '/opt/local/libexec/slapd';
-   $ldap_schema_dir = '/opt/local/etc/openldap/schema';
+   if (-d '/opt/homebrew/opt/openldap')
+   {
+       # typical paths for Homebrew on ARM
+       $slapd = '/opt/homebrew/opt/openldap/libexec/slapd';
+       $ldap_schema_dir = '/opt/homebrew/etc/openldap/schema';
+   }
+   elsif (-d '/usr/local/opt/openldap')
+   {
+       # typical paths for Homebrew on Intel
+       $slapd = '/usr/local/opt/openldap/libexec/slapd';
+       $ldap_schema_dir = '/usr/local/etc/openldap/schema';
+   }
+   elsif (-d '/opt/local/etc/openldap')
+   {
+       # typical paths for MacPorts
+       $slapd = '/opt/local/libexec/slapd';
+       $ldap_schema_dir = '/opt/local/etc/openldap/schema';
+   }
+   else
+   {
+       plan skip_all => "OpenLDAP server installation not found";
+   }
 }
 elsif ($^O eq 'linux')
 {
-   $slapd           = '/usr/sbin/slapd';
-   $ldap_schema_dir = '/etc/ldap/schema' if -d '/etc/ldap/schema';
-   $ldap_schema_dir = '/etc/openldap/schema' if -d '/etc/openldap/schema';
+   if (-d '/etc/ldap/schema')
+   {
+       $slapd = '/usr/sbin/slapd';
+       $ldap_schema_dir = '/etc/ldap/schema';
+   }
+   elsif (-d '/etc/openldap/schema')
+   {
+       $slapd = '/usr/sbin/slapd';
+       $ldap_schema_dir = '/etc/openldap/schema';
+   }
+   else
+   {
+       plan skip_all => "OpenLDAP server installation not found";
+   }
 }
 elsif ($^O eq 'freebsd')
 {
-   $slapd           = '/usr/local/libexec/slapd';
-   $ldap_schema_dir = '/usr/local/etc/openldap/schema';
+   if (-d '/usr/local/etc/openldap/schema')
+   {
+       $slapd = '/usr/local/libexec/slapd';
+       $ldap_schema_dir = '/usr/local/etc/openldap/schema';
+   }
+   else
+   {
+       plan skip_all => "OpenLDAP server installation not found";
+   }
+}
+else
+{
+   plan skip_all => "ldap tests not supported on $^O";
 }
 
 # make your own edits here
@@ -336,3 +362,5 @@ $node->restart;
 
 $ENV{"PGPASSWORD"} = 'secret1';
 test_access($node, 'test1', 2, 'bad combination of LDAPS and StartTLS');
+
+done_testing();