runtests: more compact "System characteristics" output

- no point in repeating curl features that is already listed as features
  from the curl -V output

- remove the port numbers/unix domain path from the output unless
  verbose is used, as that is rarely interesting to users.
This commit is contained in:
Daniel Stenberg
2015-11-12 15:32:48 +01:00
parent 3c24400636
commit a7c4bcd971

View File

@@ -2595,22 +2595,15 @@ sub checksystem {
"*\n"); "*\n");
} }
logmsg sprintf("* Server SSL: %8s", $stunnel?"ON ":"OFF"); logmsg sprintf("* Servers: %s", $stunnel?"SSL ":"");
logmsg sprintf(" libcurl SSL: %s\n", $has_ssl?"ON ":"OFF"); logmsg sprintf("%s", $http_ipv6?"HTTP-IPv6 ":"");
logmsg sprintf("* debug build: %8s", $debug_build?"ON ":"OFF"); logmsg sprintf("%s", $http_unix?"HTTP-unix ":"");
logmsg sprintf(" track memory: %s\n", $has_memory_tracking?"ON ":"OFF"); logmsg sprintf("%s\n", $ftp_ipv6?"FTP-IPv6 ":"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("* Env: %s", $valgrind?"Valgrind ":"");
logmsg sprintf("* SSL library: %13s\n", $ssllib); logmsg sprintf("%s\n", $libtool?"Libtool ":"");
}
if($verbose) {
logmsg "* Ports:\n"; logmsg "* Ports:\n";
logmsg sprintf("* HTTP/%d ", $HTTPPORT); logmsg sprintf("* HTTP/%d ", $HTTPPORT);
@@ -2661,7 +2654,7 @@ sub checksystem {
logmsg sprintf("* HTTP-Unix:%s\n", $HTTPUNIXPATH); logmsg sprintf("* HTTP-Unix:%s\n", $HTTPUNIXPATH);
} }
} }
}
$has_textaware = ($^O eq 'MSWin32') || ($^O eq 'msys'); $has_textaware = ($^O eq 'MSWin32') || ($^O eq 'msys');
logmsg "***************************************** \n"; logmsg "***************************************** \n";