tests/: Reduce amount of debugging output.

diff --git a/NEWS b/NEWS
index 56cccdf00895ed4f27178b3849f4e56fe8aa57a0..2cf7b4fcc32c92baab9c74d9bde74be5bead98e5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,9 @@ The file suppresses the known libgcrypt memory leaks, so they aren't
 printed when you run valgrind on the gnutls self-tests.  Use it as
 follows: valgrind --suppressions=libgcrypt.supp ./x509self
 
+** tests/: Reduce amount of debugging output by default.
+Use --verbose for each test to get the full output.
+
 ** API and ABI modifications:
 No changes since last version.
 

diff --git a/tests/anonself.c b/tests/anonself.c
index b62ffb94456dfa3357876cb288c543dc68495227..1341a4845800b73a9e79a823c70125905e283636 100644 (file)
--- a/tests/anonself.c
+++ b/tests/anonself.c
@@ -103,7 +103,8 @@ client (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (4711);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_anon_allocate_client_credentials (&anoncred);
 
@@ -281,7 +282,8 @@ server (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (4711);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_anon_allocate_server_credentials (&anoncred);
 

diff --git a/tests/dhepskself.c b/tests/dhepskself.c
index 48dfe843b1187832a843a2c1b6ae83ee670c00ac..dd0998849fdcbcdd7fa963a4458fdbb062d1b9ff 100644 (file)
--- a/tests/dhepskself.c
+++ b/tests/dhepskself.c
@@ -287,7 +287,8 @@ server (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  //  gnutls_global_set_log_level (99);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   generate_dh_params ();
 

diff --git a/tests/mini.c b/tests/mini.c
index ca00f44e6c05024c84d53e9770a03e1697452668..0a638e075d07584a7d0566f2308ed428c9e14b1a 100644 (file)
--- a/tests/mini.c
+++ b/tests/mini.c
@@ -154,7 +154,8 @@ doit (void)
   /* General init. */
   gnutls_global_init ();
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (1);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   /* Init server */
   gnutls_anon_allocate_server_credentials (&s_anoncred);

diff --git a/tests/openpgpself.c b/tests/openpgpself.c
index f5ef8b5722c398738f925cbf0873bc7d711ddd47..1c9aceea2b37fb19b5b01442959002681940da69 100644 (file)
--- a/tests/openpgpself.c
+++ b/tests/openpgpself.c
@@ -423,7 +423,8 @@ server (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (2);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_certificate_allocate_credentials (&pgp_cred);
 

diff --git a/tests/oprfi.c b/tests/oprfi.c
index be190e36d97f89acb872966809ad6bb0eb95eec4..75a1218d12dfb217c04c13d41471f7759baa53a5 100644 (file)
--- a/tests/oprfi.c
+++ b/tests/oprfi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
  *
  * Author: Simon Josefsson
  *
@@ -103,7 +103,8 @@ client (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (4711);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_anon_allocate_client_credentials (&anoncred);
 
@@ -266,7 +267,8 @@ server_start (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (4711);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_anon_allocate_server_credentials (&anoncred);
 

diff --git a/tests/x509dn.c b/tests/x509dn.c
index 5e56037db4448e6aca3ca5b1d2e00d38c3a83ddc..2d57793418e6aeec44adc47d69e57ca4e555a8df 100644 (file)
--- a/tests/x509dn.c
+++ b/tests/x509dn.c
@@ -223,7 +223,8 @@ client (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (4711);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_certificate_allocate_credentials (&xcred);
 
@@ -452,7 +453,8 @@ server (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (4711);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_certificate_allocate_credentials (&x509_cred);
   gnutls_certificate_set_x509_trust_mem (x509_cred, &ca, GNUTLS_X509_FMT_PEM);

diff --git a/tests/x509self.c b/tests/x509self.c
index 87938f890f256a70980c05114f2df0c36bfb9455..a29809b9b7c79f3310bb73571d9357ec7c9d0271 100644 (file)
--- a/tests/x509self.c
+++ b/tests/x509self.c
@@ -157,7 +157,8 @@ client (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (4711);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_certificate_allocate_credentials (&xcred);
 
@@ -386,7 +387,8 @@ server (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (4711);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_certificate_allocate_credentials (&x509_cred);
   gnutls_certificate_set_x509_trust_mem (x509_cred, &ca, GNUTLS_X509_FMT_PEM);

diff --git a/tests/x509signself.c b/tests/x509signself.c
index d6a86dd1227ae445a0c34fa4270d66cae8679dee..0d17ed1aeaae9bce0abe2e1a657b7c4ca32eb3e2 100644 (file)
--- a/tests/x509signself.c
+++ b/tests/x509signself.c
@@ -188,7 +188,8 @@ client (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (4711);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_certificate_allocate_credentials (&xcred);
 
@@ -419,7 +420,8 @@ server (void)
   gnutls_global_init ();
 
   gnutls_global_set_log_function (tls_log_func);
-  gnutls_global_set_log_level (4711);
+  if (debug)
+    gnutls_global_set_log_level (4711);
 
   gnutls_certificate_allocate_credentials (&x509_cred);
   gnutls_certificate_set_x509_trust_mem (x509_cred, &ca, GNUTLS_X509_FMT_PEM);