moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 17:18:48 -05:00
Code Issues Releases Wiki Activity

runtests: run the http2 tests on a random port number

Browse Source 
Closes #5779
This commit is contained in:
Daniel Stenberg 2020-08-04 18:08:34 +02:00
parent a0c461434c
commit c8ec04065a
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tests/runtests.pl
View File

@ -1434,7 +1434,7 @@ sub responsiveserver {
# start the http2 server # start the http2 server
# #
sub runhttp2server { sub runhttp2server {
my ($verbose, $port) = @_; my ($verbose) = @_;
my $server; my $server;
my $srvrname; my $srvrname;
my $pidfile; my $pidfile;
@ -1466,26 +1466,34 @@ sub runhttp2server {
$logfile = server_logfilename($LOGDIR, $proto, $ipvnum, $idnum); $logfile = server_logfilename($LOGDIR, $proto, $ipvnum, $idnum);
$flags .= "--pidfile \"$pidfile\" --logfile \"$logfile\" "; $flags .= "--pidfile \"$pidfile\" --logfile \"$logfile\" ";
$flags .= "--port $HTTP2PORT ";
$flags .= "--connect $HOSTIP:$HTTPPORT "; $flags .= "--connect $HOSTIP:$HTTPPORT ";
$flags .= $verbose_flag if($debugprotocol); $flags .= $verbose_flag if($debugprotocol);
my $cmd = "$exe $flags"; my ($http2pid, $pid2);
my ($http2pid, $pid2) = startnew($cmd, $pidfile, 15, 0); my $port = 23113;
for(1 .. 10) {
$port += int(rand(900));
my $aflags = "--port $port $flags";
if($http2pid <= 0 || !pidexists($http2pid)) { my $cmd = "$exe $aflags";
# it is NOT alive ($http2pid, $pid2) = startnew($cmd, $pidfile, 15, 0);
logmsg "RUN: failed to start the $srvrname server\n";
stopserver($server, "$pid2"); if($http2pid <= 0 || !pidexists($http2pid)) {
$doesntrun{$pidfile} = 1; # it is NOT alive
return (0,0); logmsg "RUN: failed to start the $srvrname server\n";
stopserver($server, "$pid2");
$doesntrun{$pidfile} = 1;
next;
}
$doesntrun{$pidfile} = 0;
if($verbose) {
logmsg "RUN: $srvrname server PID $http2pid port $port\n";
}
last;
} }
if($verbose) { return ($http2pid, $pid2, $port);
logmsg "RUN: $srvrname server is now running PID $http2pid\n";
}
return ($http2pid, $pid2);
} }
####################################################################### #######################################################################
@ -4657,7 +4665,7 @@ sub startservers {
} }
elsif($what eq "http/2") { elsif($what eq "http/2") {
if(!$run{'http/2'}) { if(!$run{'http/2'}) {
($pid, $pid2) = runhttp2server($verbose, $HTTP2PORT); ($pid, $pid2, $HTTP2PORT) = runhttp2server($verbose);
if($pid <= 0) { if($pid <= 0) {
return "failed starting HTTP/2 server"; return "failed starting HTTP/2 server";
} }
@ -5486,7 +5494,6 @@ if ($gdbthis) {
} }
$minport = $base; # original base port number $minport = $base; # original base port number
$HTTP2PORT = $base++; # HTTP/2 port
$DICTPORT = $base++; # DICT port $DICTPORT = $base++; # DICT port
$SMBPORT = $base++; # SMB port $SMBPORT = $base++; # SMB port
$SMBSPORT = $base++; # SMBS port $SMBSPORT = $base++; # SMBS port