Commitee56c3b

committed

ldap tests: Don't run on unsupported operating systems.

The tests currently fail on unsupported operating systems, rather than gettingskipped. The ony reason this doesn't cause problems is that the tests aren'trun by default.Discussion:https://postgr.es/m/721828a7-3043-6803-a85b-da63538db3cc@enterprisedb.com

1 parent2cfde3c commitee56c3bCopy full SHA for ee56c3b

File tree

+10

-5

lines changed

+10

-5

lines changed

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,18 @@`
`6`	`6`	`use PostgreSQL::Test::Utils;`
`7`	`7`	`use PostgreSQL::Test::Cluster;`
`8`	`8`	`use Test::More;`
	`9`	`+use Config;`
`9`	`10`
`10`		`-if ($ENV{with_ldap}ne'yes')`
`11`		`-{`
`12`		`-planskip_all=>'LDAP not supported by this build';`
`13`		`-}`
`14`	`11`
`15`	`12`	`my ($slapd,$ldap_bin_dir,$ldap_schema_dir);`
`16`	`13`
`17`	`14`	`$ldap_bin_dir =undef;# usually in PATH`
`18`	`15`
`19`		`-if ($^Oeq'darwin' &&-d'/usr/local/opt/openldap')`
	`16`	`+if ($ENV{with_ldap}ne'yes')`
	`17`	`+{`
	`18`	`+planskip_all=>'LDAP not supported by this build';`
	`19`	`+}`
	`20`	`+elsif ($^Oeq'darwin' &&-d'/usr/local/opt/openldap')`
`20`	`21`	`{`
`21`	`22`	`# typical paths for Homebrew`
`22`	`23`	`$slapd ='/usr/local/opt/openldap/libexec/slapd';`
`@@ -39,6 +40,10 @@`
`39`	`40`	`$slapd ='/usr/local/libexec/slapd';`
`40`	`41`	`$ldap_schema_dir ='/usr/local/etc/openldap/schema';`
`41`	`42`	`}`
	`43`	`+else`
	`44`	`+{`
	`45`	`+planskip_all=>"ldap tests not supported on $^O or dependencies not installed";`
	`46`	`+}`
`42`	`47`
`43`	`48`	`# make your own edits here`
`44`	`49`	`#$slapd = '';`

Comments

(0)