diff options
-rw-r--r-- | src/microhttpd/test_client_put_stop.c | 6 | ||||
-rw-r--r-- | src/microhttpd/test_upgrade.c | 8 | ||||
-rw-r--r-- | src/microhttpd/test_upgrade_large.c | 8 | ||||
-rw-r--r-- | src/testcurl/test_add_conn.c | 5 | ||||
-rw-r--r-- | src/testcurl/test_get_close_keep_alive.c | 5 | ||||
-rw-r--r-- | src/testcurl/test_quiesce.c | 5 | ||||
-rw-r--r-- | src/testcurl/test_toolarge.c | 5 | ||||
-rw-r--r-- | src/testcurl/test_tricky.c | 5 |
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) | |||
1985 | #endif /* ! SO_LINGER */ | 1985 | #endif /* ! SO_LINGER */ |
1986 | if (1 != use_shutdown + use_close) | 1986 | if (1 != use_shutdown + use_close) |
1987 | return 99; | 1987 | return 99; |
1988 | verbose = | 1988 | verbose = ! (has_param (argc, argv, "-q") || |
1989 | ! (has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet")); | 1989 | has_param (argc, argv, "--quiet") || |
1990 | has_param (argc, argv, "-s") || | ||
1991 | has_param (argc, argv, "--silent")); | ||
1990 | 1992 | ||
1991 | test_global_init (); | 1993 | test_global_init (); |
1992 | 1994 | ||
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, | |||
1384 | use_tls_tool = TLS_CLI_NO_TOOL; | 1384 | use_tls_tool = TLS_CLI_NO_TOOL; |
1385 | test_tls = has_in_name (argv[0], "_tls"); | 1385 | test_tls = has_in_name (argv[0], "_tls"); |
1386 | 1386 | ||
1387 | verbose = 1; | 1387 | verbose = ! (has_param (argc, argv, "-q") || |
1388 | if (has_param (argc, argv, "-q") || | 1388 | has_param (argc, argv, "--quiet") || |
1389 | has_param (argc, argv, "--quiet")) | 1389 | has_param (argc, argv, "-s") || |
1390 | verbose = 0; | 1390 | has_param (argc, argv, "--silent")); |
1391 | 1391 | ||
1392 | if (test_tls) | 1392 | if (test_tls) |
1393 | { | 1393 | { |
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, | |||
1585 | use_tls_tool = TLS_CLI_NO_TOOL; | 1585 | use_tls_tool = TLS_CLI_NO_TOOL; |
1586 | test_tls = has_in_name (argv[0], "_tls"); | 1586 | test_tls = has_in_name (argv[0], "_tls"); |
1587 | 1587 | ||
1588 | verbose = 1; | 1588 | verbose = ! (has_param (argc, argv, "-q") || |
1589 | if (has_param (argc, argv, "-q") || | 1589 | has_param (argc, argv, "--quiet") || |
1590 | has_param (argc, argv, "--quiet")) | 1590 | has_param (argc, argv, "-s") || |
1591 | verbose = 0; | 1591 | has_param (argc, argv, "--silent")); |
1592 | if (test_tls) | 1592 | if (test_tls) |
1593 | { | 1593 | { |
1594 | #ifdef HTTPS_SUPPORT | 1594 | #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) | |||
1131 | if (cleanup_test) | 1131 | if (cleanup_test) |
1132 | return 77; /* Cannot run without threads */ | 1132 | return 77; /* Cannot run without threads */ |
1133 | #endif /* HAVE_PTHREAD_H */ | 1133 | #endif /* HAVE_PTHREAD_H */ |
1134 | verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet"); | 1134 | verbose = ! (has_param (argc, argv, "-q") || |
1135 | has_param (argc, argv, "--quiet") || | ||
1136 | has_param (argc, argv, "-s") || | ||
1137 | has_param (argc, argv, "--silent")); | ||
1135 | if (cleanup_test) | 1138 | if (cleanup_test) |
1136 | { | 1139 | { |
1137 | #ifndef _WIN32 | 1140 | #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) | |||
1062 | conn_close = has_in_name (argv[0], "_close"); | 1062 | conn_close = has_in_name (argv[0], "_close"); |
1063 | if (! conn_close && ! has_in_name (argv[0], "_keep_alive")) | 1063 | if (! conn_close && ! has_in_name (argv[0], "_keep_alive")) |
1064 | return 99; | 1064 | return 99; |
1065 | verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet"); | 1065 | verbose = ! (has_param (argc, argv, "-q") || |
1066 | has_param (argc, argv, "--quiet") || | ||
1067 | has_param (argc, argv, "-s") || | ||
1068 | has_param (argc, argv, "--silent")); | ||
1066 | 1069 | ||
1067 | test_global_init (); | 1070 | test_global_init (); |
1068 | 1071 | ||
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) | |||
721 | { | 721 | { |
722 | unsigned int errorCount = 0; | 722 | unsigned int errorCount = 0; |
723 | oneone = ! has_in_name (argv[0], "10"); | 723 | oneone = ! has_in_name (argv[0], "10"); |
724 | verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet"); | 724 | verbose = ! (has_param (argc, argv, "-q") || |
725 | has_param (argc, argv, "--quiet") || | ||
726 | has_param (argc, argv, "-s") || | ||
727 | has_param (argc, argv, "--silent")); | ||
725 | 728 | ||
726 | if (0 != curl_global_init (CURL_GLOBAL_WIN32)) | 729 | if (0 != curl_global_init (CURL_GLOBAL_WIN32)) |
727 | return 2; | 730 | 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) | |||
1537 | + large_req_header_value + large_req_headers + large_rsp_header_name | 1537 | + large_req_header_value + large_req_headers + large_rsp_header_name |
1538 | + large_rsp_header_value + large_rsp_headers != 1) | 1538 | + large_rsp_header_value + large_rsp_headers != 1) |
1539 | return 99; | 1539 | return 99; |
1540 | verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet"); | 1540 | verbose = ! (has_param (argc, argv, "-q") || |
1541 | has_param (argc, argv, "--quiet") || | ||
1542 | has_param (argc, argv, "-s") || | ||
1543 | has_param (argc, argv, "--silent")); | ||
1541 | 1544 | ||
1542 | test_global_init (); | 1545 | test_global_init (); |
1543 | 1546 | ||
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) | |||
1079 | tricky_header2 = has_in_name (argv[0], "_header2") ? 1 : 0; | 1079 | tricky_header2 = has_in_name (argv[0], "_header2") ? 1 : 0; |
1080 | if (1 != tricky_url + tricky_header2) | 1080 | if (1 != tricky_url + tricky_header2) |
1081 | return 99; | 1081 | return 99; |
1082 | verbose = ! has_param (argc, argv, "-q") || has_param (argc, argv, "--quiet"); | 1082 | verbose = ! (has_param (argc, argv, "-q") || |
1083 | has_param (argc, argv, "--quiet") || | ||
1084 | has_param (argc, argv, "-s") || | ||
1085 | has_param (argc, argv, "--silent")); | ||
1083 | 1086 | ||
1084 | #if ! CURL_AT_LEAST_VERSION (7, 62, 0) | 1087 | #if ! CURL_AT_LEAST_VERSION (7, 62, 0) |
1085 | if (tricky_url) | 1088 | if (tricky_url) |