Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit99b937a

Browse files
committed
Add PG_TEST_EXTRA configure option to the Make builds
The Meson builds have PG_TEST_EXTRA as a configure-time variable,which was not available in the Make builds. To ensure both buildsystems are in sync, PG_TEST_EXTRA is now added as a configure-timevariable. It can be set like this: ./configure PG_TEST_EXTRA="kerberos, ssl, ..."Note that to preserve the old behavior, this configure-time variableis overridden by the PG_TEST_EXTRA environment variable when you runthe tests.Author: Jacob ChampionReviewed by: Ashutosh Bapat, Nazir Bilal Yavuz
1 parent3d1aec2 commit99b937a

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

‎configure

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,7 @@ LDFLAGS
764764
CFLAGS
765765
CC
766766
enable_injection_points
767+
PG_TEST_EXTRA
767768
enable_tap_tests
768769
enable_dtrace
769770
DTRACEFLAGS
@@ -880,6 +881,7 @@ enable_largefile
880881
ac_precious_vars='build_alias
881882
host_alias
882883
target_alias
884+
PG_TEST_EXTRA
883885
CC
884886
CFLAGS
885887
LDFLAGS
@@ -1587,6 +1589,9 @@ Optional Packages:
15871589
--with-openssl obsolete spelling of --with-ssl=openssl
15881590

15891591
Some influential environment variables:
1592+
PG_TEST_EXTRA
1593+
enable selected extra tests (overridden at runtime by
1594+
PG_TEST_EXTRA environment variable)
15901595
CC C compiler command
15911596
CFLAGS C compiler flags
15921597
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -3629,6 +3634,7 @@ fi
36293634

36303635

36313636

3637+
36323638
#
36333639
# Injection points
36343640
#

‎configure.ac

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ AC_SUBST(enable_dtrace)
236236
PGAC_ARG_BOOL(enable, tap-tests, no,
237237
[enable TAP tests (requires Perl and IPC::Run)])
238238
AC_SUBST(enable_tap_tests)
239+
AC_ARG_VAR(PG_TEST_EXTRA,
240+
[enable selected extra tests (overridden at runtime by PG_TEST_EXTRA environment variable)])
239241

240242
#
241243
# Injection points

‎src/Makefile.global.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,16 @@ submake-libpgfeutils: | submake-generated-headers
642642
#
643643
# Testing support
644644

645+
# Store any configure-time setting for PG_TEST_EXTRA, but let environment
646+
# variables override it to maintain the historical behavior of the tests.
647+
# (Standard `=` assignment would require devs to use a commandline option.)
648+
# This is skipped in PGXS mode to keep the setting from escaping into other
649+
# projects' builds.
650+
ifndefPGXS
651+
PG_TEST_EXTRA ?= @PG_TEST_EXTRA@
652+
exportPG_TEST_EXTRA
653+
endif
654+
645655
ifneq ($(USE_MODULE_DB),)
646656
PL_TESTDB = pl_regression_$(NAME)
647657
ifneq ($(MODULE_big),)

‎src/test/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ ifeq ($(with_ssl),openssl)
2727
SUBDIRS += ssl
2828
endif
2929

30-
# Test suites that are not safe by default but can be run if selected
31-
# by the user via the whitespace-separated list in variable PG_TEST_EXTRA.
32-
# Export PG_TEST_EXTRA to check it in individual tap tests.
33-
exportPG_TEST_EXTRA
34-
3530
# We don't build or execute these by default, but we do want "make
3631
# clean" etc to recurse into them. (We must filter out those that we
3732
# have conditionally included into SUBDIRS above, else there will be

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp