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.

diff --git a/src/test/kerberos/t/001_auth.pl b/src/test/kerberos/t/001_auth.pl
index 6efa002c30b26b4f83097afd098332947c272507..5d7add9d9e77f8b3cfed23fb71014b799289dc4b 100644 (file)
--- a/src/test/kerberos/t/001_auth.pl
+++ b/src/test/kerberos/t/001_auth.pl
@@ -32,8 +32,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 c2f588deeb897dcb2ef49d2a65460056cdde8464..d631d53efcd5a935b5f1dd663994cc3aab8fe1a3 100644 (file)
--- a/src/test/ldap/t/001_auth.pl
+++ b/src/test/ldap/t/001_auth.pl
@@ -20,9 +20,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';
 }