diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2023-07-04 11:14:53 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2023-07-04 11:25:57 +0200 |
| commit | 3bba0f917f8aa79cdb261b50bb29d96982911e4a (patch) | |
| tree | d2f5c896ea701e48a471285afca9cd61b8c0839c | |
| parent | 74ad9b0d1e7c7ef2f1c6c2468e87469b11700359 (diff) | |
| download | postgresql-3bba0f917f8aa79cdb261b50bb29d96982911e4a.tar.gz postgresql-3bba0f917f8aa79cdb261b50bb29d96982911e4a.zip | |
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.
| -rw-r--r-- | src/test/kerberos/t/001_auth.pl | 9 | ||||
| -rw-r--r-- | src/test/ldap/t/001_auth.pl | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/test/kerberos/t/001_auth.pl b/src/test/kerberos/t/001_auth.pl index b50a01a6660..0363c5f5a8e 100644 --- a/src/test/kerberos/t/001_auth.pl +++ b/src/test/kerberos/t/001_auth.pl @@ -28,8 +28,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'; } 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'; } |