moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

make ftps and https invoke both necessary servers

Browse Source
This commit is contained in:
Daniel Stenberg 2002-12-12 13:42:21 +00:00
parent 0f493b6038
commit 0150bff7b4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/runtests.pl
View File

@ -613,6 +613,7 @@ sub singletest {
} }
else { else {
$CMDLINE="$LIBDIR/$tool"; $CMDLINE="$LIBDIR/$tool";
$DBGCURL=$CMDLINE;
} }
$CMDLINE .= "$cmdargs >$STDOUT 2>$STDERR"; $CMDLINE .= "$cmdargs >$STDOUT 2>$STDERR";
@ -829,13 +830,11 @@ sub serverfortest {
push @what, "file"; push @what, "file";
} }
elsif($testnum< 400) { elsif($testnum< 400) {
# 300 - 399 is for HTTPS, two servers! # 300 - 399 is for HTTPS
push @what, "http";
push @what, "https"; push @what, "https";
} }
elsif($testnum< 500) { elsif($testnum< 500) {
# 400 - 499 is for FTPS, also two servers # 400 - 499 is for FTPS
push @what, "ftp";
push @what, "ftps"; push @what, "ftps";
} }
@ -876,6 +875,10 @@ sub serverfortest {
# or if libcurl is SSL-less # or if libcurl is SSL-less
return 1; return 1;
} }
if(!$run{'ftp'}) {
runftpserver($verbose);
$run{'ftp'}=$FTPPIDFILE;
}
if(!$run{'ftps'}) { if(!$run{'ftps'}) {
runftpsserver($verbose); runftpsserver($verbose);
$run{'ftps'}=$FTPSPIDFILE; $run{'ftps'}=$FTPSPIDFILE;
@ -890,6 +893,10 @@ sub serverfortest {
# or if libcurl is SSL-less # or if libcurl is SSL-less
return 1; return 1;
} }
if(!$run{'http'}) {
runhttpserver($verbose);
$run{'http'}=$HTTPPIDFILE;
}
if(!$run{'https'}) { if(!$run{'https'}) {
runhttpsserver($verbose); runhttpsserver($verbose);
$run{'https'}=$HTTPSPIDFILE; $run{'https'}=$HTTPSPIDFILE;