libmicrohttpd

commit 296e36ce9a9f6265a881125f81097a883733b15c
parent 2dd1b43e09ad97149f6cc0aa4bdd6cc0942841df
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 29 Jan 2018 17:44:55 +0100

make test_upgrade logging more verbose by default for #5189

Diffstat:
M
src/microhttpd/test_upgrade.c
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
@@ -1096,8 +1096,9 @@ main (int argc,
   use_tls_tool = TLS_CLI_NO_TOOL;
   test_tls = has_in_name(argv[0], "_tls");
 
-  if (has_param(argc, argv, "-v") || has_param(argc, argv, "--verbose"))
-    verbose = 1;
+  verbose = 1;
+  if (has_param(argc, argv, "-q") || has_param(argc, argv, "--quiet"))
+    verbose = 0;
 
   if (test_tls)
     {
@@ -1109,9 +1110,9 @@ main (int argc,
       else if (has_param(argc, argv, "--use-gnutls-lib"))
         use_tls_tool = TLS_LIB_GNUTLS;
 #if defined(HAVE_FORK) && defined(HAVE_WAITPID)
-      else if (0 == system ("gnutls-cli --version 1> /dev/null"))
+      else if (0 == system ("gnutls-cli --version 1> /dev/null 2> /dev/null"))
         use_tls_tool = TLS_CLI_GNUTLS;
-      else if (0 == system ("openssl version 1> /dev/null"))
+      else if (0 == system ("openssl version 1> /dev/null 2> /dev/null"))
         use_tls_tool = TLS_CLI_OPENSSL;
 #endif /* HAVE_FORK && HAVE_WAITPID */
       else