Commitaa1419e

committed

Add MacPorts support to src/test/ldap tests.

Previously the test knew how to find an OpenLDAP installation at thepaths used by Homebrew. Add the MacPorts paths too.Author: Thomas MunroReviewed-by: Tom LaneDiscussion:https://postgr.es/m/CA%2BhUKGKrjGS7sO4jc53gp3qipCtEvThtdP_%3DzoixgX5ZBq4Nbw%40mail.gmail.com

1 parentf7111f7 commitaa1419eCopy full SHA for aa1419e

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,4 @@ and net/openldap24-server.)`
`49`	`49`	`macOS: We do not recommend trying to use the Apple-provided version of`
`50`	`50`	`OpenLDAP; it's very old, plus Apple seem to have changed the launching`
`51`	`51`	`conventions for slapd. The paths in the test file are set on the`
`52`		`-assumption that you installed OpenLDAP using Homebrew.`
	`52`	`+assumption that you installed OpenLDAP using Homebrew or MacPorts.`

Lines changed: 8 additions & 1 deletion

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 ($^Oeq'darwin')`
	`20`	`+if ($^Oeq'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 ($^Oeq'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 ($^Oeq'linux')`
`26`	`33`	`{`
`27`	`34`	`$slapd ='/usr/sbin/slapd';`

Comments

(0)