Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc3382a3

anarazel

committed

Refactor PG_TEST_EXTRA logic in autoconf build

To avoid duplicating the PG_TEST_EXTRA logic in Makefiles into the upcomingmeson based build definition, move the checks into the the teststhemselves. 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

1 parentbb44a6b commitc3382a3Copy full SHA for c3382a3

File tree

6 files changed

+25

-10

lines changed

src/test
- Makefile
- kerberos/t
  - 001_auth.pl
- ldap/t
  - 001_auth.pl
- ssl/t

6 files changed

+25

-10

lines changed

`‎src/test/Makefile`

Lines changed: 5 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,25 +17,20 @@ SUBDIRS = perl regress isolation modules authentication recovery subscription`
`17`	`17`	`ifeq ($(with_icu),yes)`
`18`	`18`	`SUBDIRS += icu`
`19`	`19`	`endif`
`20`		`-`
`21`		`-# Test suites that are not safe by default but can be run if selected`
`22`		`-# by the user via the whitespace-separated list in variable`
`23`		`-# PG_TEST_EXTRA:`
`24`	`20`	`ifeq ($(with_gssapi),yes)`
`25`		`-ifneq (,$(filter kerberos,$(PG_TEST_EXTRA)))`
`26`	`21`	`SUBDIRS += kerberos`
`27`	`22`	`endif`
`28`		`-endif`
`29`	`23`	`ifeq ($(with_ldap),yes)`
`30`		`-ifneq (,$(filter ldap,$(PG_TEST_EXTRA)))`
`31`	`24`	`SUBDIRS += ldap`
`32`	`25`	`endif`
`33`		`-endif`
`34`	`26`	`ifeq ($(with_ssl),openssl)`
`35`		`-ifneq (,$(filter ssl,$(PG_TEST_EXTRA)))`
`36`	`27`	`SUBDIRS += ssl`
`37`	`28`	`endif`
`38`		`-endif`
	`29`	`+`
	`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`
`39`	`34`
`40`	`35`	`# We don't build or execute these by default, but we do want "make`
`41`	`36`	`# clean" etc to recurse into them. (We must filter out those that we`

`‎src/test/kerberos/t/001_auth.pl`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@`
`25`	`25`	`{`
`26`	`26`	`planskip_all=>'GSSAPI/Kerberos not supported by this build';`
`27`	`27`	`}`
	`28`	`+elsif ($ENV{PG_TEST_EXTRA} !~/\bkerberos\b/)`
	`29`	`+{`
	`30`	`+planskip_all=>'Potentially unsafe test GSSAPI/Kerberos not enabled in PG_TEST_EXTRA';`
	`31`	`+}`
`28`	`32`
`29`	`33`	`my ($krb5_bin_dir,$krb5_sbin_dir);`
`30`	`34`

`‎src/test/ldap/t/001_auth.pl`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@`
`16`	`16`	`{`
`17`	`17`	`planskip_all=>'LDAP not supported by this build';`
`18`	`18`	`}`
	`19`	`+elsif ($ENV{PG_TEST_EXTRA} !~/\bldap\b/)`
	`20`	`+{`
	`21`	`+planskip_all=>'Potentially unsafe test LDAP not enabled in PG_TEST_EXTRA';`
	`22`	`+}`
`19`	`23`	`elsif ($^Oeq'darwin' &&-d'/usr/local/opt/openldap')`
`20`	`24`	`{`
`21`	`25`	`# typical paths for Homebrew`

`‎src/test/ssl/t/001_ssltests.pl`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@`
`17`	`17`	`{`
`18`	`18`	`planskip_all=>'OpenSSL not supported by this build';`
`19`	`19`	`}`
	`20`	`+elsif ($ENV{PG_TEST_EXTRA} !~/ssl/)`
	`21`	`+{`
	`22`	`+planskip_all=>'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';`
	`23`	`+}`
`20`	`24`
`21`	`25`	`my$ssl_server = SSL::Server->new();`
`22`	`26`

`‎src/test/ssl/t/002_scram.pl`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@`
`20`	`20`	`{`
`21`	`21`	`planskip_all=>'OpenSSL not supported by this build';`
`22`	`22`	`}`
	`23`	`+elsif ($ENV{PG_TEST_EXTRA} !~/\bssl\b/)`
	`24`	`+{`
	`25`	`+planskip_all=>'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';`
	`26`	`+}`
`23`	`27`
`24`	`28`	`my$ssl_server = SSL::Server->new();`
`25`	`29`

`‎src/test/ssl/t/003_sslinfo.pl`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,10 @@`
`18`	`18`	`{`
`19`	`19`	`planskip_all=>'OpenSSL not supported by this build';`
`20`	`20`	`}`
	`21`	`+elsif ($ENV{PG_TEST_EXTRA} !~/\bssl\b/)`
	`22`	`+{`
	`23`	`+planskip_all=>'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';`
	`24`	`+}`
`21`	`25`
`22`	`26`	`#### Some configuration`
`23`	`27`	`my$ssl_server = SSL::Server->new();`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp