diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 1 | ||||
| -rw-r--r-- | src/test/Makefile | 24 |
2 files changed, 20 insertions, 5 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index d980f810462..dcb8dc5d90d 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -186,6 +186,7 @@ with_tcl = @with_tcl@ with_openssl = @with_openssl@ with_selinux = @with_selinux@ with_systemd = @with_systemd@ +with_ldap = @with_ldap@ with_libxml = @with_libxml@ with_libxslt = @with_libxslt@ with_system_tzdata = @with_system_tzdata@ diff --git a/src/test/Makefile b/src/test/Makefile index 73abf163f1d..3de94282999 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -14,11 +14,25 @@ include $(top_builddir)/src/Makefile.global SUBDIRS = perl regress isolation modules authentication recovery subscription -# We don't build or execute examples/, locale/, or thread/ by default, -# but we do want "make clean" etc to recurse into them. Likewise for -# ldap/ and ssl/, because these test suites are not secure to run on a -# multi-user system. -ALWAYS_SUBDIRS = examples ldap locale thread ssl +# Test suites that are not safe by default but can be run if selected +# by the user via the whitespace-separated list in variable +# PG_TEST_EXTRA: +ifeq ($(with_ldap),yes) +ifneq (,$(filter ldap,$(PG_TEST_EXTRA))) +SUBDIRS += ldap +endif +endif +ifeq ($(with_openssl),yes) +ifneq (,$(filter ssl,$(PG_TEST_EXTRA))) +SUBDIRS += ssl +endif +endif + +# We don't build or execute these by default, but we do want "make +# clean" etc to recurse into them. (We must filter out those that we +# have conditionally included into SUBDIRS above, else there will be +# make confusion.) +ALWAYS_SUBDIRS = $(filter-out $(SUBDIRS),examples ldap locale thread ssl) # We want to recurse to all subdirs for all standard targets, except that # installcheck and install should not recurse into the subdirectory "modules". |