diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 10 | ||||
| -rw-r--r-- | src/test/Makefile | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 42f50b49761..4859343153b 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -642,6 +642,16 @@ submake-libpgfeutils: | submake-generated-headers # # Testing support +# Store any configure-time setting for PG_TEST_EXTRA, but let environment +# variables override it to maintain the historical behavior of the tests. +# (Standard `=` assignment would require devs to use a commandline option.) +# This is skipped in PGXS mode to keep the setting from escaping into other +# projects' builds. +ifndef PGXS +PG_TEST_EXTRA ?= @PG_TEST_EXTRA@ +export PG_TEST_EXTRA +endif + ifneq ($(USE_MODULE_DB),) PL_TESTDB = pl_regression_$(NAME) ifneq ($(MODULE_big),) diff --git a/src/test/Makefile b/src/test/Makefile index abdd6e5a985..511a72e6238 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -27,11 +27,6 @@ ifeq ($(with_ssl),openssl) SUBDIRS += ssl 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 # have conditionally included into SUBDIRS above, else there will be |