Add MacPorts support to src/test/ldap tests.

macdice · macdice · commit aa1419e63f85 · 2019-03-26T11:44:18.000+13:00
Previously the test knew how to find an OpenLDAP installation at the paths used by Homebrew. Add the MacPorts paths too. Author: Thomas Munro Reviewed-by: Tom Lane Discussion: https://postgr.es/m/CA%2BhUKGKrjGS7sO4jc53gp3qipCtEvThtdP_%3DzoixgX5ZBq4Nbw%40mail.gmail.com
diff --git a/src/test/ldap/README b/src/test/ldap/README
@@ -49,4 +49,4 @@ and net/openldap24-server.)
 macOS: We do not recommend trying to use the Apple-provided version of
 OpenLDAP; it's very old, plus Apple seem to have changed the launching
 conventions for slapd.  The paths in the test file are set on the
-assumption that you installed OpenLDAP using Homebrew.
+assumption that you installed OpenLDAP using Homebrew or MacPorts.
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
@@ -17,11 +17,18 @@
 
 $ldap_bin_dir = undef;    # usually in PATH
 
-if ($^O eq 'darwin')
+if ($^O eq 'darwin' && -d '/usr/local/opt/openldap')
 {
+	# typical paths for Homebrew
 	$slapd           = '/usr/local/opt/openldap/libexec/slapd';
 	$ldap_schema_dir = '/usr/local/etc/openldap/schema';
 }
+elsif ($^O eq 'darwin' && -d '/opt/local/etc/openldap')
+{
+	# typical paths for MacPorts
+	$slapd           = '/opt/local/libexec/slapd';
+	$ldap_schema_dir = '/opt/local/etc/openldap/schema';
+}
 elsif ($^O eq 'linux')
 {
 	$slapd           = '/usr/sbin/slapd';

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,18 @@`
`17`	`17`
`18`	`18`	`$ldap_bin_dir = undef; # usually in PATH`
`19`	`19`
`20`		`-if ($^O eq 'darwin')`
	`20`	`+if ($^O eq 'darwin' && -d '/usr/local/opt/openldap')`
`21`	`21`	`{`
	`22`	`+ # typical paths for Homebrew`
`22`	`23`	`$slapd = '/usr/local/opt/openldap/libexec/slapd';`
`23`	`24`	`$ldap_schema_dir = '/usr/local/etc/openldap/schema';`
`24`	`25`	`}`
	`26`	`+elsif ($^O eq 'darwin' && -d '/opt/local/etc/openldap')`
	`27`	`+{`
	`28`	`+ # typical paths for MacPorts`
	`29`	`+ $slapd = '/opt/local/libexec/slapd';`
	`30`	`+ $ldap_schema_dir = '/opt/local/etc/openldap/schema';`
	`31`	`+}`
`25`	`32`	`elsif ($^O eq 'linux')`
`26`	`33`	`{`
`27`	`34`	`$slapd = '/usr/sbin/slapd';`