Follow-up fixes for "Make all Perl warnings fatal"

petere · petere · commit 9d49837d7144 · 2023-12-29T23:54:40.000+01:00
Mostly, we need to check whether $ENV{PG_TEST_EXTRA} is set before
doing regular expression matches against it.
diff --git a/src/interfaces/libpq/t/004_load_balance_dns.pl b/src/interfaces/libpq/t/004_load_balance_dns.pl
@@ -6,7 +6,7 @@
 use PostgreSQL::Test::Cluster;
 use Test::More;
 
-if ($ENV{PG_TEST_EXTRA} !~ /\bload_balance\b/)
+if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bload_balance\b/)
 {
 	plan skip_all =>
 	  'Potentially unsafe test load_balance not enabled in PG_TEST_EXTRA';
diff --git a/src/test/kerberos/t/001_auth.pl b/src/test/kerberos/t/001_auth.pl
@@ -28,7 +28,7 @@
 {
 	plan skip_all => 'GSSAPI/Kerberos not supported by this build';
 }
-elsif ($ENV{PG_TEST_EXTRA} !~ /\bkerberos\b/)
+elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bkerberos\b/)
 {
 	plan skip_all =>
 	  'Potentially unsafe test GSSAPI/Kerberos not enabled in PG_TEST_EXTRA';
@@ -203,7 +203,7 @@
 
 END
 {
-	kill 'INT', `cat $kdc_pidfile` if -f $kdc_pidfile;
+	kill 'INT', `cat $kdc_pidfile` if defined($kdc_pidfile) && -f $kdc_pidfile;
 }
 
 note "setting up PostgreSQL instance";
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
@@ -18,7 +18,7 @@
 {
 	plan skip_all => 'LDAP not supported by this build';
 }
-elsif ($ENV{PG_TEST_EXTRA} !~ /\bldap\b/)
+elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bldap\b/)
 {
 	plan skip_all =>
 	  'Potentially unsafe test LDAP not enabled in PG_TEST_EXTRA';
diff --git a/src/test/ldap/t/002_bindpasswd.pl b/src/test/ldap/t/002_bindpasswd.pl
@@ -18,7 +18,7 @@
 {
 	plan skip_all => 'LDAP not supported by this build';
 }
-elsif ($ENV{PG_TEST_EXTRA} !~ /\bldap\b/)
+elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bldap\b/)
 {
 	plan skip_all =>
 	  'Potentially unsafe test LDAP not enabled in PG_TEST_EXTRA';
diff --git a/src/test/modules/ldap_password_func/t/001_mutated_bindpasswd.pl b/src/test/modules/ldap_password_func/t/001_mutated_bindpasswd.pl
@@ -20,7 +20,7 @@
 {
 	plan skip_all => 'LDAP not supported by this build';
 }
-elsif ($ENV{PG_TEST_EXTRA} !~ /\bldap\b/)
+elsif (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bldap\b/)
 {
 	plan skip_all =>
 	  'Potentially unsafe test LDAP not enabled in PG_TEST_EXTRA';
diff --git a/src/test/modules/xid_wraparound/t/001_emergency_vacuum.pl b/src/test/modules/xid_wraparound/t/001_emergency_vacuum.pl
@@ -7,7 +7,7 @@
 use PostgreSQL::Test::Utils;
 use Test::More;
 
-if ($ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)
+if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)
 {
 	plan skip_all => "test xid_wraparound not enabled in PG_TEST_EXTRA";
 }
diff --git a/src/test/modules/xid_wraparound/t/002_limits.pl b/src/test/modules/xid_wraparound/t/002_limits.pl
@@ -14,7 +14,7 @@
 use Test::More;
 use Time::HiRes qw(usleep);
 
-if ($ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)
+if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)
 {
 	plan skip_all => "test xid_wraparound not enabled in PG_TEST_EXTRA";
 }
diff --git a/src/test/modules/xid_wraparound/t/003_wraparounds.pl b/src/test/modules/xid_wraparound/t/003_wraparounds.pl
@@ -10,7 +10,7 @@
 use Test::More;
 use Time::HiRes qw(usleep);
 
-if ($ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)
+if (!$ENV{PG_TEST_EXTRA} || $ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)
 {
 	plan skip_all => "test xid_wraparound not enabled in PG_TEST_EXTRA";
 }
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} !~ /\bssl\b/)
+elsif (!$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} !~ /\bssl\b/)
+elsif (!$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} !~ /\bssl\b/)
+elsif (!$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
`@@ -6,7 +6,7 @@`
`6`	`6`	`use PostgreSQL::Test::Cluster;`
`7`	`7`	`use Test::More;`
`8`	`8`
`9`		`-if ($ENV{PG_TEST_EXTRA} !~ /\bload_balance\b/)`
	`9`	`+if (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bload_balance\b/)`
`10`	`10`	`{`
`11`	`11`	`plan skip_all =>`
`12`	`12`	`'Potentially unsafe test load_balance not enabled in PG_TEST_EXTRA';`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`{`
`29`	`29`	`plan skip_all => 'GSSAPI/Kerberos not supported by this build';`
`30`	`30`	`}`
`31`		`-elsif ($ENV{PG_TEST_EXTRA} !~ /\bkerberos\b/)`
	`31`	`+elsif (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bkerberos\b/)`
`32`	`32`	`{`
`33`	`33`	`plan skip_all =>`
`34`	`34`	`'Potentially unsafe test GSSAPI/Kerberos not enabled in PG_TEST_EXTRA';`
`@@ -203,7 +203,7 @@`
`203`	`203`
`204`	`204`	`END`
`205`	`205`	`{`
`206`		- kill 'INT', `cat $kdc_pidfile` if -f $kdc_pidfile;
	`206`	+ kill 'INT', `cat $kdc_pidfile` if defined($kdc_pidfile) && -f $kdc_pidfile;
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`note "setting up PostgreSQL instance";`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`{`
`19`	`19`	`plan skip_all => 'LDAP not supported by this build';`
`20`	`20`	`}`
`21`		`-elsif ($ENV{PG_TEST_EXTRA} !~ /\bldap\b/)`
	`21`	`+elsif (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bldap\b/)`
`22`	`22`	`{`
`23`	`23`	`plan skip_all =>`
`24`	`24`	`'Potentially unsafe test LDAP 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 => 'LDAP not supported by this build';`
`22`	`22`	`}`
`23`		`-elsif ($ENV{PG_TEST_EXTRA} !~ /\bldap\b/)`
	`23`	`+elsif (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bldap\b/)`
`24`	`24`	`{`
`25`	`25`	`plan skip_all =>`
`26`	`26`	`'Potentially unsafe test LDAP not enabled in PG_TEST_EXTRA';`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use PostgreSQL::Test::Utils;`
`8`	`8`	`use Test::More;`
`9`	`9`
`10`		`-if ($ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)`
	`10`	`+if (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)`
`11`	`11`	`{`
`12`	`12`	`plan skip_all => "test xid_wraparound not enabled in PG_TEST_EXTRA";`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use Test::More;`
`15`	`15`	`use Time::HiRes qw(usleep);`
`16`	`16`
`17`		`-if ($ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)`
	`17`	`+if (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)`
`18`	`18`	`{`
`19`	`19`	`plan skip_all => "test xid_wraparound not enabled in PG_TEST_EXTRA";`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Test::More;`
`11`	`11`	`use Time::HiRes qw(usleep);`
`12`	`12`
`13`		`-if ($ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)`
	`13`	`+if (!$ENV{PG_TEST_EXTRA} \|\| $ENV{PG_TEST_EXTRA} !~ /\bxid_wraparound\b/)`
`14`	`14`	`{`
`15`	`15`	`plan skip_all => "test xid_wraparound not enabled in PG_TEST_EXTRA";`
`16`	`16`	`}`
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} !~ /\bssl\b/)`
	`20`	`+elsif (!$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';`