Refactor PG_TEST_EXTRA logic in autoconf build

anarazel · anarazel · commit c3382a3c3ccd · 2022-09-20T11:24:16.000-07:00
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
diff --git 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
diff --git a/src/test/kerberos/t/001_auth.pl b/src/test/kerberos/t/001_auth.pl
@@ -25,6 +25,10 @@
 {
 	plan skip_all => 'GSSAPI/Kerberos not supported by this build';
 }
+elsif ($ENV{PG_TEST_EXTRA} !~ /\bkerberos\b/)
+{
+	plan skip_all => 'Potentially unsafe test GSSAPI/Kerberos not enabled in PG_TEST_EXTRA';
+}
 
 my ($krb5_bin_dir, $krb5_sbin_dir);
 
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
@@ -16,6 +16,10 @@
 {
 	plan skip_all => 'LDAP not supported by this build';
 }
+elsif ($ENV{PG_TEST_EXTRA} !~ /\bldap\b/)
+{
+	plan skip_all => 'Potentially unsafe test LDAP not enabled in PG_TEST_EXTRA';
+}
 elsif ($^O eq 'darwin' && -d '/usr/local/opt/openldap')
 {
 	# typical paths for Homebrew
diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
@@ -17,6 +17,10 @@
 {
 	plan skip_all => 'OpenSSL not supported by this build';
 }
+elsif ($ENV{PG_TEST_EXTRA} !~ /ssl/)
+{
+	plan skip_all => 'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';
+}
 
 my $ssl_server = SSL::Server->new();
 
diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl
@@ -20,6 +20,10 @@
 {
 	plan skip_all => 'OpenSSL not supported by this build';
 }
+elsif ($ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
+{
+	plan skip_all => 'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';
+}
 
 my $ssl_server = SSL::Server->new();
 
diff --git a/src/test/ssl/t/003_sslinfo.pl b/src/test/ssl/t/003_sslinfo.pl
@@ -18,6 +18,10 @@
 {
 	plan skip_all => 'OpenSSL not supported by this build';
 }
+elsif ($ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
+{
+	plan skip_all => 'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';
+}
 
 #### Some configuration
 my $ssl_server = SSL::Server->new();

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@`
`25`	`25`	`{`
`26`	`26`	`plan skip_all => 'GSSAPI/Kerberos not supported by this build';`
`27`	`27`	`}`
	`28`	`+elsif ($ENV{PG_TEST_EXTRA} !~ /\bkerberos\b/)`
	`29`	`+{`
	`30`	`+ plan skip_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`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@`
`16`	`16`	`{`
`17`	`17`	`plan skip_all => 'LDAP not supported by this build';`
`18`	`18`	`}`
	`19`	`+elsif ($ENV{PG_TEST_EXTRA} !~ /\bldap\b/)`
	`20`	`+{`
	`21`	`+ plan skip_all => 'Potentially unsafe test LDAP not enabled in PG_TEST_EXTRA';`
	`22`	`+}`
`19`	`23`	`elsif ($^O eq 'darwin' && -d '/usr/local/opt/openldap')`
`20`	`24`	`{`
`21`	`25`	`# typical paths for Homebrew`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@`
`17`	`17`	`{`
`18`	`18`	`plan skip_all => 'OpenSSL not supported by this build';`
`19`	`19`	`}`
	`20`	`+elsif ($ENV{PG_TEST_EXTRA} !~ /ssl/)`
	`21`	`+{`
	`22`	`+ plan skip_all => 'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';`
	`23`	`+}`
`20`	`24`
`21`	`25`	`my $ssl_server = SSL::Server->new();`
`22`	`26`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@`
`20`	`20`	`{`
`21`	`21`	`plan skip_all => 'OpenSSL not supported by this build';`
`22`	`22`	`}`
	`23`	`+elsif ($ENV{PG_TEST_EXTRA} !~ /\bssl\b/)`
	`24`	`+{`
	`25`	`+ plan skip_all => 'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';`
	`26`	`+}`
`23`	`27`
`24`	`28`	`my $ssl_server = SSL::Server->new();`
`25`	`29`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,10 @@`
`18`	`18`	`{`
`19`	`19`	`plan skip_all => 'OpenSSL not supported by this build';`
`20`	`20`	`}`
	`21`	`+elsif ($ENV{PG_TEST_EXTRA} !~ /\bssl\b/)`
	`22`	`+{`
	`23`	`+ plan skip_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();`