Adjust kerberos and ldap tests for Homebrew on ARM
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:
parent
1605623ec6
commit
c2cff443b0
|
@ -15,8 +15,15 @@ else
|
|||
|
||||
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_sbin_dir = '/usr/local/opt/krb5/sbin';
|
||||
}
|
||||
|
|
|
@ -17,9 +17,15 @@ my ($slapd, $ldap_bin_dir, $ldap_schema_dir);
|
|||
|
||||
$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';
|
||||
$ldap_schema_dir = '/usr/local/etc/openldap/schema';
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue