database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-05 23:56:58 +03:00
Code

Add PG_TEST_EXTRA configure option to the Make builds

Browse Source 
The Meson builds have PG_TEST_EXTRA as a configure-time variable,
which was not available in the Make builds. To ensure both build
systems are in sync, PG_TEST_EXTRA is now added as a configure-time
variable. It can be set like this:

    ./configure PG_TEST_EXTRA="kerberos, ssl, ..."

Note that to preserve the old behavior, this configure-time variable
is overridden by the PG_TEST_EXTRA environment variable when you run
the tests.

Author: Jacob Champion
Reviewed by: Ashutosh Bapat, Nazir Bilal Yavuz
This commit is contained in:
Heikki Linnakangas 2024-11-04 14:09:38 +02:00
parent 3d1aec225a
commit 99b937a44f
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -764,6 +764,7 @@ LDFLAGS
CFLAGS CFLAGS
CC CC
enable_injection_points enable_injection_points
PG_TEST_EXTRA
enable_tap_tests enable_tap_tests
enable_dtrace enable_dtrace
DTRACEFLAGS DTRACEFLAGS
@ -880,6 +881,7 @@ enable_largefile
ac_precious_vars='build_alias ac_precious_vars='build_alias
host_alias host_alias
target_alias target_alias
PG_TEST_EXTRA
CC CC
CFLAGS CFLAGS
LDFLAGS LDFLAGS
@ -1587,6 +1589,9 @@ Optional Packages:
--with-openssl obsolete spelling of --with-ssl=openssl --with-openssl obsolete spelling of --with-ssl=openssl
Some influential environment variables: Some influential environment variables:
PG_TEST_EXTRA
enable selected extra tests (overridden at runtime by
PG_TEST_EXTRA environment variable)
CC C compiler command CC C compiler command
CFLAGS C compiler flags CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@ -3629,6 +3634,7 @@ fi
# #
# Injection points # Injection points
# #

2
configure.ac
View File

@ -236,6 +236,8 @@ AC_SUBST(enable_dtrace)
PGAC_ARG_BOOL(enable, tap-tests, no, PGAC_ARG_BOOL(enable, tap-tests, no,
[enable TAP tests (requires Perl and IPC::Run)]) [enable TAP tests (requires Perl and IPC::Run)])
AC_SUBST(enable_tap_tests) AC_SUBST(enable_tap_tests)
AC_ARG_VAR(PG_TEST_EXTRA,
[enable selected extra tests (overridden at runtime by PG_TEST_EXTRA environment variable)])
# #
# Injection points # Injection points

10
src/Makefile.global.in
View File

@ -642,6 +642,16 @@ submake-libpgfeutils: | submake-generated-headers
# #
# Testing support # 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),) ifneq ($(USE_MODULE_DB),)
PL_TESTDB = pl_regression_$(NAME) PL_TESTDB = pl_regression_$(NAME)
ifneq ($(MODULE_big),) ifneq ($(MODULE_big),)

5
src/test/Makefile
View File

@ -27,11 +27,6 @@ ifeq ($(with_ssl),openssl)
SUBDIRS += ssl 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 # 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 # clean" etc to recurse into them. (We must filter out those that we
# have conditionally included into SUBDIRS above, else there will be # have conditionally included into SUBDIRS above, else there will be