1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust kerberos and ldap tests for Homebrew on ARM

Browse Source 
The Homebrew package manager changed its default installation prefix
for the new architecture, so a couple of tests need tweaks to find
binaries.

This is a partial backpatch of dc513bc654.
This commit is contained in:
Peter Eisentraut 2023-07-04 11:14:53 +02:00
parent a0003572f2
commit 75373ff6c0
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/kerberos/t/001_auth.pl
View File

@ -28,8 +28,15 @@ else
my ($krb5_bin_dir, $krb5_sbin_dir); my ($krb5_bin_dir, $krb5_sbin_dir);
if ($^O eq 'darwin') if ($^O eq 'darwin' && -d "/opt/homebrew" )
{ {
# typical paths for Homebrew on ARM
$krb5_bin_dir = '/opt/homebrew/opt/krb5/bin';
$krb5_sbin_dir = '/opt/homebrew/opt/krb5/sbin';
}
elsif ($^O eq 'darwin')
{
# typical paths for Homebrew on Intel
$krb5_bin_dir = '/usr/local/opt/krb5/bin'; $krb5_bin_dir = '/usr/local/opt/krb5/bin';
$krb5_sbin_dir = '/usr/local/opt/krb5/sbin'; $krb5_sbin_dir = '/usr/local/opt/krb5/sbin';
} }

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

@ -17,9 +17,15 @@ my ($slapd, $ldap_bin_dir, $ldap_schema_dir);
$ldap_bin_dir = undef; # usually in PATH $ldap_bin_dir = undef; # usually in PATH
if ($^O eq 'darwin' && -d '/usr/local/opt/openldap') if ($^O eq 'darwin' && -d '/opt/homebrew/opt/openldap')
{ {
# typical paths for Homebrew # 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'; $slapd = '/usr/local/opt/openldap/libexec/slapd';
$ldap_schema_dir = '/usr/local/etc/openldap/schema'; $ldap_schema_dir = '/usr/local/etc/openldap/schema';
} }