8 files changed, 32 insertions, 15 deletions

diff --git a/src/microhttpd/test_client_put_stop.c b/src/microhttpd/test_client_put_stop.c
index 6c641e6f..09845ff9 100644
--- a/src/microhttpd/test_client_put_stop.c
+++ b/src/microhttpd/test_client_put_stop.c
@@ -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 ();
 
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 0bbb08e9..acaecf9f 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -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)
   {
diff --git a/src/microhttpd/test_upgrade_large.c b/src/microhttpd/test_upgrade_large.c
index 1928080d..e04e7ebf 100644
--- a/src/microhttpd/test_upgrade_large.c
+++ b/src/microhttpd/test_upgrade_large.c
@@ -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
diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c
index 811bfba4..62386657 100644
--- a/src/testcurl/test_add_conn.c
+++ b/src/testcurl/test_add_conn.c
@@ -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
diff --git a/src/testcurl/test_get_close_keep_alive.c b/src/testcurl/test_get_close_keep_alive.c
index 1cb46e68..8f83fa1d 100644
--- a/src/testcurl/test_get_close_keep_alive.c
+++ b/src/testcurl/test_get_close_keep_alive.c
@@ -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 ();
 
diff --git a/src/testcurl/test_quiesce.c b/src/testcurl/test_quiesce.c
index 1ea194b9..f7703db7 100644
--- a/src/testcurl/test_quiesce.c
+++ b/src/testcurl/test_quiesce.c
@@ -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;
diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c
index 134fd8af..d8bfaef6 100644
--- a/src/testcurl/test_toolarge.c
+++ b/src/testcurl/test_toolarge.c
@@ -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 ();
 
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c
index afb29bbd..1aca7dce 100644
--- a/src/testcurl/test_tricky.c
+++ b/src/testcurl/test_tricky.c
@@ -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)