diff options
| -rwxr-xr-x | tests/runtests.pl | 121 |
1 files changed, 57 insertions, 64 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index 4dbe563c7..3f43b97d3 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -2595,73 +2595,66 @@ sub checksystem { "*\n"); } - logmsg sprintf("* Server SSL: %8s", $stunnel?"ON ":"OFF"); - logmsg sprintf(" libcurl SSL: %s\n", $has_ssl?"ON ":"OFF"); - logmsg sprintf("* debug build: %8s", $debug_build?"ON ":"OFF"); - logmsg sprintf(" track memory: %s\n", $has_memory_tracking?"ON ":"OFF"); - logmsg sprintf("* valgrind: %8s", $valgrind?"ON ":"OFF"); - logmsg sprintf(" HTTP IPv6 %s\n", $http_ipv6?"ON ":"OFF"); - logmsg sprintf("* HTTP Unix %s\n", $http_unix?"ON ":"OFF"); - logmsg sprintf("* FTP IPv6 %8s", $ftp_ipv6?"ON ":"OFF"); - logmsg sprintf(" Libtool lib: %s\n", $libtool?"ON ":"OFF"); - logmsg sprintf("* PSL: %8s", $has_psl?"ON ":"OFF"); - logmsg sprintf(" Resolver: %s\n", $resolver); - - if($has_ssl) { - logmsg sprintf("* SSL library: %13s\n", $ssllib); - } - - logmsg "* Ports:\n"; - - logmsg sprintf("* HTTP/%d ", $HTTPPORT); - logmsg sprintf("FTP/%d ", $FTPPORT); - logmsg sprintf("FTP2/%d ", $FTP2PORT); - logmsg sprintf("RTSP/%d ", $RTSPPORT); - if($stunnel) { - logmsg sprintf("FTPS/%d ", $FTPSPORT); - logmsg sprintf("HTTPS/%d ", $HTTPSPORT); - } - logmsg sprintf("\n* TFTP/%d ", $TFTPPORT); - if($http_ipv6) { - logmsg sprintf("HTTP-IPv6/%d ", $HTTP6PORT); - logmsg sprintf("RTSP-IPv6/%d ", $RTSP6PORT); - } - if($ftp_ipv6) { - logmsg sprintf("FTP-IPv6/%d ", $FTP6PORT); - } - if($tftp_ipv6) { - logmsg sprintf("TFTP-IPv6/%d ", $TFTP6PORT); - } - logmsg sprintf("\n* GOPHER/%d ", $GOPHERPORT); - if($gopher_ipv6) { - logmsg sprintf("GOPHER-IPv6/%d", $GOPHERPORT); - } - logmsg sprintf("\n* SSH/%d ", $SSHPORT); - logmsg sprintf("SOCKS/%d ", $SOCKSPORT); - logmsg sprintf("POP3/%d ", $POP3PORT); - logmsg sprintf("IMAP/%d ", $IMAPPORT); - logmsg sprintf("SMTP/%d\n", $SMTPPORT); - if($ftp_ipv6) { - logmsg sprintf("* POP3-IPv6/%d ", $POP36PORT); - logmsg sprintf("IMAP-IPv6/%d ", $IMAP6PORT); - logmsg sprintf("SMTP-IPv6/%d\n", $SMTP6PORT); - } - if($httptlssrv) { - logmsg sprintf("* HTTPTLS/%d ", $HTTPTLSPORT); - if($has_ipv6) { - logmsg sprintf("HTTPTLS-IPv6/%d ", $HTTPTLS6PORT); - } - logmsg "\n"; - } - logmsg sprintf("* HTTP-PIPE/%d \n", $HTTPPIPEPORT); + logmsg sprintf("* Servers: %s", $stunnel?"SSL ":""); + logmsg sprintf("%s", $http_ipv6?"HTTP-IPv6 ":""); + logmsg sprintf("%s", $http_unix?"HTTP-unix ":""); + logmsg sprintf("%s\n", $ftp_ipv6?"FTP-IPv6 ":"OFF"); - if($has_unix) { - logmsg "* Unix socket paths:\n"; - if($http_unix) { - logmsg sprintf("* HTTP-Unix:%s\n", $HTTPUNIXPATH); + logmsg sprintf("* Env: %s", $valgrind?"Valgrind ":""); + logmsg sprintf("%s\n", $libtool?"Libtool ":""); + + if($verbose) { + logmsg "* Ports:\n"; + + logmsg sprintf("* HTTP/%d ", $HTTPPORT); + logmsg sprintf("FTP/%d ", $FTPPORT); + logmsg sprintf("FTP2/%d ", $FTP2PORT); + logmsg sprintf("RTSP/%d ", $RTSPPORT); + if($stunnel) { + logmsg sprintf("FTPS/%d ", $FTPSPORT); + logmsg sprintf("HTTPS/%d ", $HTTPSPORT); } - } + logmsg sprintf("\n* TFTP/%d ", $TFTPPORT); + if($http_ipv6) { + logmsg sprintf("HTTP-IPv6/%d ", $HTTP6PORT); + logmsg sprintf("RTSP-IPv6/%d ", $RTSP6PORT); + } + if($ftp_ipv6) { + logmsg sprintf("FTP-IPv6/%d ", $FTP6PORT); + } + if($tftp_ipv6) { + logmsg sprintf("TFTP-IPv6/%d ", $TFTP6PORT); + } + logmsg sprintf("\n* GOPHER/%d ", $GOPHERPORT); + if($gopher_ipv6) { + logmsg sprintf("GOPHER-IPv6/%d", $GOPHERPORT); + } + logmsg sprintf("\n* SSH/%d ", $SSHPORT); + logmsg sprintf("SOCKS/%d ", $SOCKSPORT); + logmsg sprintf("POP3/%d ", $POP3PORT); + logmsg sprintf("IMAP/%d ", $IMAPPORT); + logmsg sprintf("SMTP/%d\n", $SMTPPORT); + if($ftp_ipv6) { + logmsg sprintf("* POP3-IPv6/%d ", $POP36PORT); + logmsg sprintf("IMAP-IPv6/%d ", $IMAP6PORT); + logmsg sprintf("SMTP-IPv6/%d\n", $SMTP6PORT); + } + if($httptlssrv) { + logmsg sprintf("* HTTPTLS/%d ", $HTTPTLSPORT); + if($has_ipv6) { + logmsg sprintf("HTTPTLS-IPv6/%d ", $HTTPTLS6PORT); + } + logmsg "\n"; + } + logmsg sprintf("* HTTP-PIPE/%d \n", $HTTPPIPEPORT); + if($has_unix) { + logmsg "* Unix socket paths:\n"; + if($http_unix) { + logmsg sprintf("* HTTP-Unix:%s\n", $HTTPUNIXPATH); + } + } + } $has_textaware = ($^O eq 'MSWin32') || ($^O eq 'msys'); logmsg "***************************************** \n"; |