diff options
| author | Peter Eisentraut | 2023-07-04 09:14:53 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2023-07-04 09:16:36 +0000 |
| commit | 75373ff6c0ef2c517eff57c8b6ea996a4858a0ba (patch) | |
| tree | b73c22a9e00c95e2ab32f7e842ddf1d458f4f5d8 /src/test/ldap | |
| parent | a0003572f214c0e4b40374aefa46c818ad92d999 (diff) | |
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.
Diffstat (limited to 'src/test/ldap')
| -rw-r--r-- | src/test/ldap/t/001_auth.pl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl index 2019674ed4d..f5c6181d817 100644 --- a/src/test/ldap/t/001_auth.pl +++ b/src/test/ldap/t/001_auth.pl @@ -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'; } |