File tree 6 files changed +25
-10
lines changed
6 files changed +25
-10
lines changed 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
+ export PG_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
Original file line number Diff line number Diff line change 25
25
{
26
26
plan skip_all => ' GSSAPI/Kerberos not supported by this build' ;
27
27
}
28
+ elsif ($ENV {PG_TEST_EXTRA } !~ / \b kerberos\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
16
{
17
17
plan skip_all => ' LDAP not supported by this build' ;
18
18
}
19
+ elsif ($ENV {PG_TEST_EXTRA } !~ / \b ldap\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
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
20
{
21
21
plan skip_all => ' OpenSSL not supported by this build' ;
22
22
}
23
+ elsif ($ENV {PG_TEST_EXTRA } !~ / \b ssl\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
18
{
19
19
plan skip_all => ' OpenSSL not supported by this build' ;
20
20
}
21
+ elsif ($ENV {PG_TEST_EXTRA } !~ / \b ssl\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();
You can’t perform that action at this time.
0 commit comments