rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Heikki Linnakangas 2024-04-07 20:21:21 +03:00
parent b7b0f3f272
commit e13b586d7c
3 changed files with 67 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/test/ldap/LdapServer.pm
View File

@ -57,49 +57,88 @@ use File::Basename;
# private variables # private variables
my ($slapd, $ldap_schema_dir, @servers); my ($slapd, $ldap_schema_dir, @servers);
# visible variable # visible variables
our ($setup); our ($setup, $setup_error);
INIT INIT
{ {
# Find the OpenLDAP server binary and directory containing schema
# definition files. On success, $setup is set to 1. On failure,
# it's set to 0, and an error message is set in $setup_error.
$setup = 1; $setup = 1;
if ($^O eq 'darwin' && -d '/opt/homebrew/opt/openldap') if ($^O eq 'darwin')
{ {
# typical paths for Homebrew on ARM if (-d '/opt/homebrew/opt/openldap')
$slapd = '/opt/homebrew/opt/openldap/libexec/slapd'; {
$ldap_schema_dir = '/opt/homebrew/etc/openldap/schema'; # typical paths for Homebrew on ARM
} $slapd = '/opt/homebrew/opt/openldap/libexec/slapd';
elsif ($^O eq 'darwin' && -d '/usr/local/opt/openldap') $ldap_schema_dir = '/opt/homebrew/etc/openldap/schema';
{ }
# typical paths for Homebrew on Intel elsif (-d '/usr/local/opt/openldap')
$slapd = '/usr/local/opt/openldap/libexec/slapd'; {
$ldap_schema_dir = '/usr/local/etc/openldap/schema'; # typical paths for Homebrew on Intel
} $slapd = '/usr/local/opt/openldap/libexec/slapd';
elsif ($^O eq 'darwin' && -d '/opt/local/etc/openldap') $ldap_schema_dir = '/usr/local/etc/openldap/schema';
{ }
# typical paths for MacPorts elsif (-d '/opt/local/etc/openldap')
$slapd = '/opt/local/libexec/slapd'; {
$ldap_schema_dir = '/opt/local/etc/openldap/schema'; # typical paths for MacPorts
$slapd = '/opt/local/libexec/slapd';
$ldap_schema_dir = '/opt/local/etc/openldap/schema';
}
else
{
$setup_error = "OpenLDAP server installation not found";
$setup = 0;
}
} }
elsif ($^O eq 'linux') elsif ($^O eq 'linux')
{ {
$slapd = '/usr/sbin/slapd'; if (-d '/etc/ldap/schema')
$ldap_schema_dir = '/etc/ldap/schema' if -d '/etc/ldap/schema'; {
$ldap_schema_dir = '/etc/openldap/schema' $slapd = '/usr/sbin/slapd';
if -d '/etc/openldap/schema'; $ldap_schema_dir = '/etc/ldap/schema';
}
elsif (-d '/etc/openldap/schema')
{
$slapd = '/usr/sbin/slapd';
$ldap_schema_dir = '/etc/openldap/schema';
}
else
{
$setup_error = "OpenLDAP server installation not found";
$setup = 0;
}
} }
elsif ($^O eq 'freebsd') elsif ($^O eq 'freebsd')
{ {
$slapd = '/usr/local/libexec/slapd'; if (-d '/usr/local/etc/openldap/schema')
$ldap_schema_dir = '/usr/local/etc/openldap/schema'; {
$slapd = '/usr/local/libexec/slapd';
$ldap_schema_dir = '/usr/local/etc/openldap/schema';
}
else
{
$setup_error = "OpenLDAP server installation not found";
$setup = 0;
}
} }
elsif ($^O eq 'openbsd') elsif ($^O eq 'openbsd')
{ {
$slapd = '/usr/local/libexec/slapd'; if (-d '/usr/local/share/examples/openldap/schema')
$ldap_schema_dir = '/usr/local/share/examples/openldap/schema'; {
$slapd = '/usr/local/libexec/slapd';
$ldap_schema_dir = '/usr/local/share/examples/openldap/schema';
}
else
{
$setup_error = "OpenLDAP server installation not found";
$setup = 0;
}
} }
else else
{ {
$setup_error = "ldap tests not supported on $^O";
$setup = 0; $setup = 0;
} }
} }

3
src/test/ldap/t/001_auth.pl
View File

@ -25,8 +25,7 @@ elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bldap\b/)
} }
elsif (!$LdapServer::setup) elsif (!$LdapServer::setup)
{ {
plan skip_all => plan skip_all => $LdapServer::setup_error;
"ldap tests not supported on $^O or dependencies not installed";
} }
note "setting up LDAP server"; note "setting up LDAP server";

3
src/test/ldap/t/002_bindpasswd.pl
View File

@ -25,8 +25,7 @@ elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bldap\b/)
} }
elsif (!$LdapServer::setup) elsif (!$LdapServer::setup)
{ {
plan skip_all => plan skip_all => $LdapServer::setup_error;
"ldap tests not supported on $^O or dependencies not installed";
} }
note "setting up LDAP server"; note "setting up LDAP server";