tests/: Reduce amount of debugging output.

8 files changed, 27 insertions, 14 deletions

diff --git a/tests/anonself.c b/tests/anonself.c
index b62ffb9445..1341a48458 100644
--- 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 48dfe843b1..dd0998849f 100644
--- 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 ca00f44e6c..0a638e075d 100644
--- 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 f5ef8b5722..1c9aceea2b 100644
--- 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 be190e36d9..75a1218d12 100644
--- 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 5e56037db4..2d57793418 100644
--- 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 87938f890f..a29809b9b7 100644
--- 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 d6a86dd122..0d17ed1aea 100644
--- 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);