Test for PG_TEST_EXTRA separately in SSL tests

danielgustafsson · danielgustafsson · commit e5f1f0a4f2ab · 2024-09-03T18:57:54.000+02:00
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
diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
@@ -17,7 +17,7 @@
 {
 	plan skip_all => 'OpenSSL not supported by this build';
 }
-elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
+if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
 {
 	plan skip_all =>
 	  'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';
diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl
@@ -20,7 +20,7 @@
 {
 	plan skip_all => 'OpenSSL not supported by this build';
 }
-elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
+if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
 {
 	plan skip_all =>
 	  'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';
diff --git a/src/test/ssl/t/003_sslinfo.pl b/src/test/ssl/t/003_sslinfo.pl
@@ -18,7 +18,7 @@
 {
 	plan skip_all => 'OpenSSL not supported by this build';
 }
-elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
+if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)
 {
 	plan skip_all =>
 	  'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`{`
`18`	`18`	`plan skip_all => 'OpenSSL not supported by this build';`
`19`	`19`	`}`
`20`		`-elsif (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)`
	`20`	`+if (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)`
`21`	`21`	`{`
`22`	`22`	`plan skip_all =>`
`23`	`23`	`'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`{`
`21`	`21`	`plan skip_all => 'OpenSSL not supported by this build';`
`22`	`22`	`}`
`23`		`-elsif (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)`
	`23`	`+if (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)`
`24`	`24`	`{`
`25`	`25`	`plan skip_all =>`
`26`	`26`	`'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`{`
`19`	`19`	`plan skip_all => 'OpenSSL not supported by this build';`
`20`	`20`	`}`
`21`		`-elsif (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)`
	`21`	`+if (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bssl\b/)`
`22`	`22`	`{`
`23`	`23`	`plan skip_all =>`
`24`	`24`	`'Potentially unsafe test SSL not enabled in PG_TEST_EXTRA';`