postgres.git / summary / log / commit / refs

commit    c2cff443b0b182a07ef4aa17559302ace48c3e62
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Tue Jul 04 09:14:53 2023 +0000
First released in: 11.21, 12.16, 13.12, 14.9

    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.


 src/test/kerberos/t/001_auth.pl |  9 ++++++++-
 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 5bc606d7a10..16155c97625 100644
--- a/src/test/kerberos/t/001_auth.pl
+++ b/src/test/kerberos/t/001_auth.pl
@@ -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';
 }
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';
 }


[parent: 1605623ec686]