aboutsummaryrefslogtreecommitdiff
path: root/tests/runtests.pl
diff options
context:
space:
mode:
Diffstat (limited to 'tests/runtests.pl')
-rwxr-xr-xtests/runtests.pl20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl
index ddcda5c20..b8497f9c2 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -367,7 +367,7 @@ delete $ENV{'CURL_CA_BUNDLE'} if($ENV{'CURL_CA_BUNDLE'});
# Load serverpidfile hash with pidfile names for all possible servers.
#
sub init_serverpidfile_hash {
- for my $proto (('ftp', 'http', 'imap', 'pop3', 'smtp')) {
+ for my $proto (('ftp', 'http', 'imap', 'pop3', 'smtp', 'http/2')) {
for my $ssl (('', 's')) {
for my $ipvnum ((4, 6)) {
for my $idnum ((1, 2, 3)) {
@@ -387,7 +387,7 @@ sub init_serverpidfile_hash {
}
}
}
- for my $proto (('http', 'imap', 'pop3', 'smtp')) {
+ for my $proto (('http', 'imap', 'pop3', 'smtp', 'http/2')) {
for my $ssl (('', 's')) {
my $serv = servername_id("$proto$ssl", "unix", 1);
my $pidf = server_pidfilename("$proto$ssl", "unix", 1);
@@ -1200,7 +1200,7 @@ sub runhttp2server {
my $pidfile;
my $logfile;
my $flags = "";
- my $proto="http2";
+ my $proto="http/2";
my $ipvnum = 4;
my $idnum = 0;
my $exe = "$perl $srcdir/http2-server.pl";
@@ -2543,7 +2543,7 @@ sub checksystem {
# http2 enabled
$has_http2=1;
- push @protocols, 'http2';
+ push @protocols, 'http/2';
}
}
#
@@ -3032,7 +3032,7 @@ sub singletest {
next;
}
}
- elsif($1 eq "http2") {
+ elsif($1 eq "http/2") {
if($has_http2) {
next;
}
@@ -4255,7 +4255,7 @@ sub startservers {
for(@what) {
my (@whatlist) = split(/\s+/,$_);
my $what = lc($whatlist[0]);
- $what =~ s/[^a-z0-9-]//g;
+ $what =~ s/[^a-z0-9\/-]//g;
my $certfile;
if($what =~ /^(ftp|http|imap|pop3|smtp)s((\d*)(-ipv6|-unix|))$/) {
@@ -4341,15 +4341,15 @@ sub startservers {
$run{'gopher-ipv6'}="$pid $pid2";
}
}
- elsif($what eq "http2") {
- if(!$run{'http2'}) {
+ elsif($what eq "http/2") {
+ if(!$run{'http/2'}) {
($pid, $pid2) = runhttp2server($verbose, $HTTP2PORT);
if($pid <= 0) {
return "failed starting HTTP/2 server";
}
- logmsg sprintf ("* pid http => %d %d\n", $pid, $pid2)
+ logmsg sprintf ("* pid http/2 => %d %d\n", $pid, $pid2)
if($verbose);
- $run{'http2'}="$pid $pid2";
+ $run{'http/2'}="$pid $pid2";
}
}
elsif($what eq "http") {