From c702f3366a4b144bea76e738f744b10ce9c9c57d Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Sat, 17 Feb 2018 21:16:29 +0900 Subject: [PATCH 1/2] Prevent SSL and LDAP tests from running without support in build An extra set of checks in each one of the test files is added to make the tests fail should they be invoked without the proper build options. This makes use of TestLib::check_pg_config to check for the build configuration. --- src/test/ldap/t/001_auth.pl | 4 ++++ src/test/ssl/t/001_ssltests.pl | 4 ++++ src/test/ssl/t/002_scram.pl | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl index a83d96ae91..9d5065c494 100644 --- a/src/test/ldap/t/001_auth.pl +++ b/src/test/ldap/t/001_auth.pl @@ -4,6 +4,10 @@ use TestLib; use PostgresNode; use Test::More tests => 19; +# LDAP tests are not supported without proper build options +die "LDAP tests not supported without support in build" unless + check_pg_config("#define USE_LDAP 1"); + my ($slapd, $ldap_bin_dir, $ldap_schema_dir); $ldap_bin_dir = undef; # usually in PATH diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl index e53bd12ae9..bf68a727eb 100644 --- a/src/test/ssl/t/001_ssltests.pl +++ b/src/test/ssl/t/001_ssltests.pl @@ -6,6 +6,10 @@ use Test::More tests => 40; use ServerSetup; use File::Copy; +# SSL tests are not supported without proper build options +die "SSL tests not supported without support in build" unless + check_pg_config("#define USE_OPENSSL 1"); + #### Some configuration # This is the hostname used to connect to the server. This cannot be a diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl index 67c1409a6e..8e79b6a99f 100644 --- a/src/test/ssl/t/002_scram.pl +++ b/src/test/ssl/t/002_scram.pl @@ -8,6 +8,10 @@ use Test::More tests => 5; use ServerSetup; use File::Copy; +# SSL tests are not supported without proper build +die "SSL tests not supported without support in build" unless + check_pg_config("#define USE_OPENSSL 1"); + # This is the hostname used to connect to the server. my $SERVERHOSTADDR = '127.0.0.1'; -- 2.16.1