Reduced several unneeded messages during the make check procedure.

Verbose messages can be obtained with --verbose.

1 files changed, 23 insertions, 20 deletions

diff --git a/tests/x509dn.c b/tests/x509dn.c
index 87c19e7c1d..08e7954bc3 100644
--- a/tests/x509dn.c
+++ b/tests/x509dn.c
@@ -124,7 +124,7 @@ cert_callback (gnutls_session_t session,
       return -1;
     }
 
-  success ("client: invoked to provide client cert.\n");
+  if (debug) success ("client: invoked to provide client cert.\n");
 
   result = gnutls_x509_dn_init (&dn);
   if (result < 0)
@@ -138,16 +138,16 @@ cert_callback (gnutls_session_t session,
     {
       gnutls_x509_ava_st val;
 
-      success ("client: imported DN.\n");
+      if (debug) success ("client: imported DN.\n");
 
       if (gnutls_x509_dn_get_rdn_ava (dn, 0, 0, &val) == 0)
 	{
-	  success ("client: got RDN 0.\n");
+	  if (debug) success ("client: got RDN 0.\n");
 
 	  if (val.value.size == strlen (EXPECT_RDN0)
 	      && strncmp (val.value.data, EXPECT_RDN0, val.value.size) == 0)
 	    {
-	      success ("client: RND 0 correct.\n");
+	      if (debug) success ("client: RND 0 correct.\n");
 	    }
 	  else
 	    {
@@ -224,21 +224,21 @@ client (void)
     }
   else
     {
-      success ("client: Handshake was completed\n");
+      if (debug) success ("client: Handshake was completed\n");
     }
 
-  success ("client: TLS version is: %s\n",
+  if (debug) success ("client: TLS version is: %s\n",
 	   gnutls_protocol_get_name (gnutls_protocol_get_version (session)));
 
   /* see the Getting peer's information example */
-  print_info (session);
+  if (debug) print_info (session);
 
   gnutls_record_send (session, MSG, strlen (MSG));
 
   ret = gnutls_record_recv (session, buffer, MAX_BUF);
   if (ret == 0)
     {
-      success ("client: Peer has closed the TLS connection\n");
+      if (debug) success ("client: Peer has closed the TLS connection\n");
       goto end;
     }
   else if (ret < 0)
@@ -247,12 +247,15 @@ client (void)
       goto end;
     }
 
-  printf ("- Received %d bytes: ", ret);
-  for (ii = 0; ii < ret; ii++)
+  if (debug)
     {
-      fputc (buffer[ii], stdout);
+      printf ("- Received %d bytes: ", ret);
+      for (ii = 0; ii < ret; ii++)
+        {
+          fputc (buffer[ii], stdout);
+        }
+      fputs ("\n", stdout);
     }
-  fputs ("\n", stdout);
 
   gnutls_bye (session, GNUTLS_SHUT_RDWR);
 
@@ -405,7 +408,7 @@ server_start (void)
       return;
     }
 
-  success ("server: ready. Listening to port '%d'.\n", PORT);
+  if (debug) success ("server: ready. Listening to port '%d'.\n", PORT);
 }
 
 static void
@@ -425,7 +428,7 @@ server (void)
   gnutls_certificate_set_x509_key_mem (x509_cred, &server_cert, &server_key,
 				       GNUTLS_X509_FMT_PEM);
 
-  success ("Launched, generating DH parameters...\n");
+  if (debug) success ("Launched, generating DH parameters...\n");
 
   generate_dh_params ();
 
@@ -437,7 +440,7 @@ server (void)
 
   sd = accept (listen_sd, (SA *) & sa_cli, &client_len);
 
-  success ("server: connection from %s, port %d\n",
+  if (debug) success ("server: connection from %s, port %d\n",
 	   inet_ntop (AF_INET, &sa_cli.sin_addr, topbuf,
 		      sizeof (topbuf)), ntohs (sa_cli.sin_port));
 
@@ -450,13 +453,13 @@ server (void)
       fail ("server: Handshake has failed (%s)\n\n", gnutls_strerror (ret));
       return;
     }
-  success ("server: Handshake was completed\n");
+  if (debug) success ("server: Handshake was completed\n");
 
-  success ("server: TLS version is: %s\n",
+  if (debug) success ("server: TLS version is: %s\n",
 	   gnutls_protocol_get_name (gnutls_protocol_get_version (session)));
 
   /* see the Getting peer's information example */
-  print_info (session);
+  if (debug) print_info (session);
 
   i = 0;
   for (;;)
@@ -466,7 +469,7 @@ server (void)
 
       if (ret == 0)
 	{
-	  success ("server: Peer has closed the GNUTLS connection\n");
+	  if (debug) success ("server: Peer has closed the GNUTLS connection\n");
 	  break;
 	}
       else if (ret < 0)
@@ -496,7 +499,7 @@ server (void)
 
   gnutls_global_deinit ();
 
-  success ("server: finished\n");
+  if (debug) success ("server: finished\n");
 }