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

tests: move server config files under the pid dir

Browse source 
These files are generated by the test servers and must therefore be
found in the log directory to make them available to only those servers
once multiple test runners are executing in parallel. They must also not
be deleted with the log files, so they are stored in the pidfile
directory.

Ref: #10818
Closes #10875
This commit is contained in:
Dan Fandrich 2023-03-30 21:32:17 -07:00
parent 1cffced9c5
commit 70d2fca2f6
56 changed files with 158 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/runtests.pl
View file

@ -1098,7 +1098,7 @@ sub verifysftp {
}
# Connect to sftp server, authenticate and run a remote pwd
# command using our generated configuration and key files
my $cmd = "\"$sftp\" -b $sftpcmds -F $sftpconfig -S \"$ssh\" $ip > $sftplog 2>&1";
my $cmd = "\"$sftp\" -b $PIDDIR/$sftpcmds -F $PIDDIR/$sftpconfig -S \"$ssh\" $ip > $sftplog 2>&1";
my $res = runclient($cmd);
# Search for pwd command response in log file
if(open(my $sftplogfile, "<", "$sftplog")) {
@ -2212,12 +2212,12 @@ sub runsshserver {
if(!$wport) {
logmsg "RUN: couldn't start $srvrname. Tried these ports:";
logmsg "RUN: ".join(", ", @tports);
logmsg "RUN: ".join(", ", @tports)."\n";
return (0,0,0);
}
my $hostfile;
if(!open($hostfile, "<", $hstpubmd5f) ||
if(!open($hostfile, "<", $PIDDIR . "/" . $hstpubmd5f) ||
(read($hostfile, $SSHSRVMD5, 32) != 32) ||
!close($hostfile) ||
($SSHSRVMD5 !~ /^[a-f0-9]{32}$/i))
@ -2228,7 +2228,7 @@ sub runsshserver {
die $msg;
}
if(!open($hostfile, "<", $hstpubsha256f) ||
if(!open($hostfile, "<", $PIDDIR . "/" . $hstpubsha256f) ||
(read($hostfile, $SSHSRVSHA256, 48) == 0) ||
!close($hostfile))
{