summaryrefslogtreecommitdiff
path: root/src/test/Makefile
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2022-09-20 11:09:30 -0700
committerAndres Freund <andres@anarazel.de>2022-09-20 11:24:16 -0700
commitc3382a3c3ccda6df126c95bf37dcc762480c5202 (patch)
treea13e7f7b436f69b098c6b5b01b7687247a4098ed /src/test/Makefile
parentbb44a6ba48edfe1ac8bca87b1f2cfdcd9f86c930 (diff)
downloadpostgresql-c3382a3c3ccda6df126c95bf37dcc762480c5202.tar.gz
Refactor PG_TEST_EXTRA logic in autoconf build
To avoid duplicating the PG_TEST_EXTRA logic in Makefiles into the upcoming meson based build definition, move the checks into the the tests themselves. That also has the advantage of making skipped tests visible. Reviewed-by: Peter Eisentraut <peter.eisentraut@enterprisedb.com> Author: Nazir Bilal Yavuz <byavuz81@gmail.com> Author: Andres Freund <andres@anarazel.de> Discussion: https://postgr.es/m/7dae5979-c6c0-cec5-7a36-76a85aa8053d@enterprisedb.com
Diffstat (limited to 'src/test/Makefile')
-rw-r--r--src/test/Makefile15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/test/Makefile b/src/test/Makefile
index 69ef074d75..dbd3192874 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -17,25 +17,20 @@ SUBDIRS = perl regress isolation modules authentication recovery subscription
ifeq ($(with_icu),yes)
SUBDIRS += icu
endif
-
-# 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_gssapi),yes)
-ifneq (,$(filter kerberos,$(PG_TEST_EXTRA)))
SUBDIRS += kerberos
endif
-endif
ifeq ($(with_ldap),yes)
-ifneq (,$(filter ldap,$(PG_TEST_EXTRA)))
SUBDIRS += ldap
endif
-endif
ifeq ($(with_ssl),openssl)
-ifneq (,$(filter ssl,$(PG_TEST_EXTRA)))
SUBDIRS += ssl
endif
-endif
+
+# 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.
+# Export PG_TEST_EXTRA to check it in individual tap tests.
+export PG_TEST_EXTRA
# 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