git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2cfde3c)
ldap tests: Don't run on unsupported operating systems.
Wed, 9 Mar 2022 17:31:02 +0000 (09:31 -0800)
Wed, 9 Mar 2022 17:31:02 +0000 (09:31 -0800)
The tests currently fail on unsupported operating systems, rather than getting
skipped. The ony reason this doesn't cause problems is that the tests aren't
run by default.

Discussion: https://postgr.es/m/721828a7-3043-6803-a85b-da63538db3cc@enterprisedb.com


diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
index 094270cb5d43f34cc89e5a9b17eeb53a464574e1..2c7ce2a8aa880eb0ba231882e2a9894c7222ea36 100644 (file)
--- a/src/test/ldap/t/001_auth.pl
+++ b/src/test/ldap/t/001_auth.pl
@@ -6,17 +6,18 @@ use warnings;
use PostgreSQL::Test::Utils;
use PostgreSQL::Test::Cluster;
use Test::More;
+use Config;
-if ($ENV{with_ldap} ne 'yes')
-{
- plan skip_all => 'LDAP not supported by this build';
-}
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 ($ENV{with_ldap} ne 'yes')
+{
+ plan skip_all => 'LDAP not supported by this build';
+}
+elsif ($^O eq 'darwin' && -d '/usr/local/opt/openldap')
{
# typical paths for Homebrew
$slapd = '/usr/local/opt/openldap/libexec/slapd';
@@ -39,6 +40,10 @@ elsif ($^O eq 'freebsd')
$slapd = '/usr/local/libexec/slapd';
$ldap_schema_dir = '/usr/local/etc/openldap/schema';
}
+else
+{
+ plan skip_all => "ldap tests not supported on $^O or dependencies not installed";
+}
# make your own edits here
#$slapd = '';
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /