mirror of https://github.com/postgres/postgres
Ignore more environment variables in TAP tests
Various environment variables were not getting reset in the TAP tests, which would cause failures depending on the tests or the environment variables involved. For example, PGSSL{MAX,MIN}PROTOCOLVERSION could cause failures in the SSL tests. Even worse, a junk value of PGCLIENTENCODING makes a server startup fail. The list of variables reset is adjusted in each stable branch depending on what is supported. While on it, simplify a bit the code per a suggestion from Andrew Dunstan, using a list of variables instead of doing single deletions. Reviewed-by: Andrew Dunstan, Daniel Gustafsson Discussion: https://postgr.es/m/YLbjjRpucIeZ78VQ@paquier.xyz Backpatch-through: 9.6
This commit is contained in:
parent
3eca18522e
commit
a886e2ff24
|
@ -51,16 +51,31 @@ BEGIN
|
|||
delete $ENV{LC_ALL};
|
||||
$ENV{LC_MESSAGES} = 'C';
|
||||
|
||||
delete $ENV{PGCONNECT_TIMEOUT};
|
||||
delete $ENV{PGDATA};
|
||||
delete $ENV{PGDATABASE};
|
||||
delete $ENV{PGHOSTADDR};
|
||||
delete $ENV{PGREQUIRESSL};
|
||||
delete $ENV{PGSERVICE};
|
||||
delete $ENV{PGSSLMODE};
|
||||
delete $ENV{PGUSER};
|
||||
delete $ENV{PGPORT};
|
||||
delete $ENV{PGHOST};
|
||||
my @envkeys = qw (
|
||||
PGCLIENTENCODING
|
||||
PGCONNECT_TIMEOUT
|
||||
PGDATA
|
||||
PGDATABASE
|
||||
PGGSSLIB
|
||||
PGHOSTADDR
|
||||
PGKRBSRVNAME
|
||||
PGPASSFILE
|
||||
PGPASSWORD
|
||||
PGREQUIREPEER
|
||||
PGREQUIRESSL
|
||||
PGSERVICE
|
||||
PGSERVICEFILE
|
||||
PGSSLCERT
|
||||
PGSSLCRL
|
||||
PGSSLCRLDIR
|
||||
PGSSLKEY
|
||||
PGSSLMODE
|
||||
PGSSLROOTCERT
|
||||
PGUSER
|
||||
PGPORT
|
||||
PGHOST
|
||||
);
|
||||
delete @ENV{@envkeys};
|
||||
|
||||
# Must be set early
|
||||
$windows_os = $Config{osname} eq 'MSWin32' || $Config{osname} eq 'msys';
|
||||
|
|
Loading…
Reference in New Issue