mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change TAP test framework to not rely on having a chmod executable.

Browse Source 
This might not work at all on Windows, and is not ever efficient.

Michael Paquier
This commit is contained in:
Robert Haas 2015-06-19 10:46:30 -04:00
parent b76e76be46
commit ca3f43aa48
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/ssl/ServerSetup.pm
View File

@ -43,6 +43,20 @@ sub copy_files
} }
} }
# Perform chmod on a set of files, taking into account wildcards
sub chmod_files
{
my $mode = shift;
my $file_expr = shift;
my @all_files = glob $file_expr;
foreach my $file_entry (@all_files)
{
chmod $mode, $file_entry
or die "Could not run chmod with mode $mode on $file_entry";
}
}
sub configure_test_server_for_ssl sub configure_test_server_for_ssl
{ {
my $tempdir = $_[0]; my $tempdir = $_[0];
@ -68,7 +82,7 @@ sub configure_test_server_for_ssl
# Copy all server certificates and keys, and client root cert, to the data dir # Copy all server certificates and keys, and client root cert, to the data dir
copy_files("ssl/server-*.crt", "$tempdir/pgdata"); copy_files("ssl/server-*.crt", "$tempdir/pgdata");
copy_files("ssl/server-*.key", "$tempdir/pgdata"); copy_files("ssl/server-*.key", "$tempdir/pgdata");
system_or_bail "chmod 0600 '$tempdir'/pgdata/server-*.key"; chmod_files(0600, "$tempdir/pgdata/server-*.key");
copy_files("ssl/root+client_ca.crt", "$tempdir/pgdata"); copy_files("ssl/root+client_ca.crt", "$tempdir/pgdata");
copy_files("ssl/root+client.crl", "$tempdir/pgdata"); copy_files("ssl/root+client.crl", "$tempdir/pgdata");

2
src/test/ssl/t/001_ssltests.pl
View File

@ -78,7 +78,7 @@ sub test_connect_fails
# The client's private key must not be world-readable. Git doesn't track # The client's private key must not be world-readable. Git doesn't track
# permissions (except for the executable bit), so they might be wrong after # permissions (except for the executable bit), so they might be wrong after
# a checkout. # a checkout.
system_or_bail "chmod 0600 ssl/client.key"; chmod 0600, "ssl/client.key";
#### Part 0. Set up the server. #### Part 0. Set up the server.