Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e5f1f0a

Browse files
Test for PG_TEST_EXTRA separately in SSL tests
PG_TEST_EXTRA is an override and should be tested for separately from any other test as there is no dependency on whether OpenSSL is available or not. Reviewed-by: Peter Eisentraut <peter@eisentraut.org> Discussion: https://postgr.es/m/01F4684C-8C98-4BBE-AB83-AC8D7C746AF8@yesql.se
1 parent 31a9893 commit e5f1f0a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{
1818
plan skip_all => 'OpenSSL not supported by this build';
1919
}
20-
elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
20+
if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
2121
{
2222
plan skip_all =>
2323
'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{
2121
plan skip_all => 'OpenSSL not supported by this build';
2222
}
23-
elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
23+
if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
2424
{
2525
plan skip_all =>
2626
'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
{
1919
plan skip_all => 'OpenSSL not supported by this build';
2020
}
21-
elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
21+
if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
2222
{
2323
plan skip_all =>
2424
'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';

0 commit comments

Comments
 (0)