romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 19:23:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests: move pidfiles and portfiles under the log directory

Browse source 
This is to segregate all files written by a test process into a single
root to allow for future parallel testing.

Ref: #10818
Closes #10874
This commit is contained in:
Dan Fandrich 2023-03-30 13:25:17 -07:00
parent ec2a5bc5fc
commit 3cc41a2d36
9 changed files with 105 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/serverhelp.pm
View file

@ -146,18 +146,18 @@ sub servername_canon {
# Return file name for server pid file.
#
sub server_pidfilename {
my ($proto, $ipver, $idnum) = @_;
my ($piddir, $proto, $ipver, $idnum) = @_;
my $trailer = '_server.pid';
return '.'. servername_canon($proto, $ipver, $idnum) ."$trailer";
return "${piddir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
}
#***************************************************************************
# Return file name for server port file.
#
sub server_portfilename {
my ($proto, $ipver, $idnum) = @_;
my ($piddir, $proto, $ipver, $idnum) = @_;
my $trailer = '_server.port';
return '.'. servername_canon($proto, $ipver, $idnum) ."$trailer";
return "${piddir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
}
@ -206,11 +206,11 @@ sub server_outputfilename {
# Return file name for main or primary sockfilter pid file.
#
sub mainsockf_pidfilename {
my ($proto, $ipver, $idnum) = @_;
my ($piddir, $proto, $ipver, $idnum) = @_;
die "unsupported protocol: '$proto'" unless($proto &&
(lc($proto) =~ /^(ftp|imap|pop3|smtp)s?$/));
my $trailer = (lc($proto) =~ /^ftps?$/) ? '_sockctrl.pid':'_sockfilt.pid';
return '.'. servername_canon($proto, $ipver, $idnum) ."$trailer";
return "${piddir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
}
@ -230,11 +230,11 @@ sub mainsockf_logfilename {
# Return file name for data or secondary sockfilter pid file.
#
sub datasockf_pidfilename {
my ($proto, $ipver, $idnum) = @_;
my ($piddir, $proto, $ipver, $idnum) = @_;
die "unsupported protocol: '$proto'" unless($proto &&
(lc($proto) =~ /^ftps?$/));
my $trailer = '_sockdata.pid';
return '.'. servername_canon($proto, $ipver, $idnum) ."$trailer";
return "${piddir}/". servername_canon($proto, $ipver, $idnum) ."$trailer";
}