test: fixed processing '--quiet' parameter

Added support for '--silent' and '-s' parameters.
This commit is contained in:
Evgeny Grin (Karlson2k)
2022-01-30 18:35:25 +03:00
parent a901003360
commit 76caa2901b
8 changed files with 32 additions and 15 deletions
+4 -2
View File
@@ -1985,8 +1985,10 @@ main (int argc, char *const *argv)
#endif /* ! SO_LINGER */
if (1 != use_shutdown + use_close)
return 99;
verbose =
! (has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet"));
verbose = ! (has_param (argc, argv, "-q") ||
has_param (argc, argv, "--quiet") ||
has_param (argc, argv, "-s") ||
has_param (argc, argv, "--silent"));
test_global_init ();
+4 -4
View File
@@ -1384,10 +1384,10 @@ main (int argc,
use_tls_tool = TLS_CLI_NO_TOOL;
test_tls = has_in_name (argv[0], "_tls");
verbose = 1;
if (has_param (argc, argv, "-q") ||
has_param (argc, argv, "--quiet"))
verbose = 0;
verbose = ! (has_param (argc, argv, "-q") ||
has_param (argc, argv, "--quiet") ||
has_param (argc, argv, "-s") ||
has_param (argc, argv, "--silent"));
if (test_tls)
{
+4 -4
View File
@@ -1585,10 +1585,10 @@ main (int argc,
use_tls_tool = TLS_CLI_NO_TOOL;
test_tls = has_in_name (argv[0], "_tls");
verbose = 1;
if (has_param (argc, argv, "-q") ||
has_param (argc, argv, "--quiet"))
verbose = 0;
verbose = ! (has_param (argc, argv, "-q") ||
has_param (argc, argv, "--quiet") ||
has_param (argc, argv, "-s") ||
has_param (argc, argv, "--silent"));
if (test_tls)
{
#ifdef HTTPS_SUPPORT
+4 -1
View File
@@ -1131,7 +1131,10 @@ main (int argc, char *const *argv)
if (cleanup_test)
return 77; /* Cannot run without threads */
#endif /* HAVE_PTHREAD_H */
verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet");
verbose = ! (has_param (argc, argv, "-q") ||
has_param (argc, argv, "--quiet") ||
has_param (argc, argv, "-s") ||
has_param (argc, argv, "--silent"));
if (cleanup_test)
{
#ifndef _WIN32
+4 -1
View File
@@ -1062,7 +1062,10 @@ main (int argc, char *const *argv)
conn_close = has_in_name (argv[0], "_close");
if (! conn_close && ! has_in_name (argv[0], "_keep_alive"))
return 99;
verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet");
verbose = ! (has_param (argc, argv, "-q") ||
has_param (argc, argv, "--quiet") ||
has_param (argc, argv, "-s") ||
has_param (argc, argv, "--silent"));
test_global_init ();
+4 -1
View File
@@ -721,7 +721,10 @@ main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
oneone = ! has_in_name (argv[0], "10");
verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet");
verbose = ! (has_param (argc, argv, "-q") ||
has_param (argc, argv, "--quiet") ||
has_param (argc, argv, "-s") ||
has_param (argc, argv, "--silent"));
if (0 != curl_global_init (CURL_GLOBAL_WIN32))
return 2;
+4 -1
View File
@@ -1537,7 +1537,10 @@ main (int argc, char *const *argv)
+ large_req_header_value + large_req_headers + large_rsp_header_name
+ large_rsp_header_value + large_rsp_headers != 1)
return 99;
verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet");
verbose = ! (has_param (argc, argv, "-q") ||
has_param (argc, argv, "--quiet") ||
has_param (argc, argv, "-s") ||
has_param (argc, argv, "--silent"));
test_global_init ();
+4 -1
View File
@@ -1079,7 +1079,10 @@ main (int argc, char *const *argv)
tricky_header2 = has_in_name (argv[0], "_header2") ? 1 : 0;
if (1 != tricky_url + tricky_header2)
return 99;
verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet");
verbose = ! (has_param (argc, argv, "-q") ||
has_param (argc, argv, "--quiet") ||
has_param (argc, argv, "-s") ||
has_param (argc, argv, "--silent"));
#if ! CURL_AT_LEAST_VERSION (7, 62, 0)
if (tricky_url)