summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-02-26 14:06:40 +0000
committerChristian Grothoff <christian@grothoff.org>2012-02-26 14:06:40 +0000
commit468c386e4834af2f2a36d5e81891f8a0ed517a23 (patch)
tree2ca977b2d367ff2a9b0139aa0d564318feadb7c3 /src
parent95df3b354109633a602ddb99d2edfeeb25da8462 (diff)
-verbose is independent of logging
Diffstat (limited to 'src')
-rw-r--r--src/arm/test_arm_api.c2
-rw-r--r--src/arm/test_exponential_backoff.c2
-rw-r--r--src/arm/test_gnunet_service_manager.c2
-rw-r--r--src/ats-test/perf_transport_ats.c2
-rw-r--r--src/ats-test/test_transport_ats_multiple_peers.c2
-rw-r--r--src/ats/gnunet-service-ats_addresses.c2
-rw-r--r--src/ats/perf_ats_mlp.c2
-rw-r--r--src/ats/test_ats_api_bandwidth_consumption.c4
-rw-r--r--src/ats/test_ats_api_scheduling.c4
-rw-r--r--src/ats/test_ats_api_update_address.c4
-rw-r--r--src/ats/test_ats_mlp.c2
-rw-r--r--src/ats/test_ats_mlp_averaging.c2
-rw-r--r--src/block/test_block.c2
-rw-r--r--src/chat/test_chat.c2
-rw-r--r--src/chat/test_chat_private.c2
-rw-r--r--src/datacache/perf_datacache.c2
-rw-r--r--src/datacache/test_datacache.c2
-rw-r--r--src/datacache/test_datacache_quota.c2
-rw-r--r--src/datastore/perf_datastore_api.c2
-rw-r--r--src/datastore/perf_plugin_datastore.c2
-rw-r--r--src/datastore/test_datastore_api.c2
-rw-r--r--src/datastore/test_datastore_api_management.c2
-rw-r--r--src/datastore/test_plugin_datastore.c2
-rw-r--r--src/fragmentation/test_fragmentation.c2
-rw-r--r--src/fs/perf_gnunet_service_fs_p2p.c2
-rw-r--r--src/fs/perf_gnunet_service_fs_p2p_trust.c2
-rw-r--r--src/hello/test_hello.c2
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist.c2
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_learning.c2
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_reconnect.c2
-rw-r--r--src/namestore/test_namestore_api.c2
-rw-r--r--src/namestore/test_plugin_namestore.c2
-rw-r--r--src/nat/test_nat.c2
-rw-r--r--src/nat/test_nat_mini.c2
-rw-r--r--src/nat/test_nat_test.c2
-rw-r--r--src/nse/test_nse_multipeer.c2
-rw-r--r--src/statistics/test_statistics_api_loop.c2
-rw-r--r--src/statistics/test_statistics_api_watch.c2
-rw-r--r--src/template/test_template_api.c2
-rw-r--r--src/testing/test_testing_connect.c2
-rw-r--r--src/testing/test_testing_group.c2
-rw-r--r--src/testing/test_testing_peergroup.c2
-rw-r--r--src/testing/test_testing_topology.c2
-rw-r--r--src/testing/test_testing_topology_blacklist.c2
-rw-r--r--src/testing/testing_group.c4
-rw-r--r--src/topology/test_gnunet_daemon_topology.c2
-rw-r--r--src/transport/gnunet-transport-connect-running-peers.c4
-rw-r--r--src/transport/test_plugin_transport.c2
-rw-r--r--src/transport/test_plugin_transport_udp.c2
-rw-r--r--src/transport/test_quota_compliance.c2
-rw-r--r--src/transport/test_transport_api.c4
-rw-r--r--src/transport/test_transport_api_bidirectional_connect.c4
-rw-r--r--src/transport/test_transport_api_blacklisting.c4
-rw-r--r--src/transport/test_transport_api_disconnect.c4
-rw-r--r--src/transport/test_transport_api_limited_sockets.c4
-rw-r--r--src/transport/test_transport_api_reliability.c4
-rw-r--r--src/transport/test_transport_api_restart_1peer.c4
-rw-r--r--src/transport/test_transport_api_restart_2peers.c4
-rw-r--r--src/transport/test_transport_api_timeout.c4
-rw-r--r--src/transport/test_transport_api_unreliability.c2
-rw-r--r--src/transport/test_transport_api_unreliability_constant.c4
-rw-r--r--src/transport/test_transport_startonly.c4
-rw-r--r--src/transport/test_transport_testing.c4
-rw-r--r--src/util/test_client.c2
-rw-r--r--src/util/test_common_logging_runtime_loglevels.c2
-rw-r--r--src/util/test_connection.c2
-rw-r--r--src/util/test_connection_addressing.c2
-rw-r--r--src/util/test_connection_receive_cancel.c2
-rw-r--r--src/util/test_connection_timeout.c2
-rw-r--r--src/util/test_connection_timeout_no_connect.c2
-rw-r--r--src/util/test_connection_transmit_cancel.c2
-rw-r--r--src/util/test_os_start_process.c2
-rw-r--r--src/util/test_plugin.c2
-rw-r--r--src/util/test_resolver_api.c2
-rw-r--r--src/util/test_scheduler.c2
-rw-r--r--src/util/test_scheduler_delay.c2
-rw-r--r--src/util/test_server.c2
-rw-r--r--src/util/test_server_disconnect.c2
-rw-r--r--src/util/test_server_with_client.c2
-rw-r--r--src/util/test_server_with_client_unix.c2
-rw-r--r--src/util/test_service.c2
-rw-r--r--src/util/test_strings.c2
-rw-r--r--src/util/test_time.c2
83 files changed, 100 insertions, 100 deletions
diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index 74e225809..086cfc258 100644
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -30,7 +30,7 @@
#include "gnunet_program_lib.h"
#include "gnunet_resolver_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index df0efb7f5..edd5cbf83 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -28,7 +28,7 @@
#include "gnunet_program_lib.h"
#include "gnunet_protocols.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/arm/test_gnunet_service_manager.c b/src/arm/test_gnunet_service_manager.c
index 413a9e760..fe3357161 100644
--- a/src/arm/test_gnunet_service_manager.c
+++ b/src/arm/test_gnunet_service_manager.c
@@ -39,7 +39,7 @@
#define START_ARM GNUNET_YES
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
static int ret = 1;
diff --git a/src/ats-test/perf_transport_ats.c b/src/ats-test/perf_transport_ats.c
index e148c9384..0be15d255 100644
--- a/src/ats-test/perf_transport_ats.c
+++ b/src/ats-test/perf_transport_ats.c
@@ -26,7 +26,7 @@
#include "gauger.h"
#include <glpk.h>
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define EXECS 5
diff --git a/src/ats-test/test_transport_ats_multiple_peers.c b/src/ats-test/test_transport_ats_multiple_peers.c
index 7425ff45d..66077df8d 100644
--- a/src/ats-test/test_transport_ats_multiple_peers.c
+++ b/src/ats-test/test_transport_ats_multiple_peers.c
@@ -30,7 +30,7 @@
#include "gauger.h"
#include "gnunet-service-transport_ats.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define NUM_PEERS 11
#define MEASUREMENTS 5
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 8900abcb6..fb9bad037 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -35,7 +35,7 @@
#include "gnunet-service-ats_addresses_mlp.h"
#endif
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
enum ATS_Mode
{
diff --git a/src/ats/perf_ats_mlp.c b/src/ats/perf_ats_mlp.c
index 79a362115..a15e4b4b8 100644
--- a/src/ats/perf_ats_mlp.c
+++ b/src/ats/perf_ats_mlp.c
@@ -30,7 +30,7 @@
#include "gnunet-service-ats_addresses_mlp.h"
#define VERBOSE GNUNET_YES
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define MLP_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
#define MLP_MAX_ITERATIONS INT_MAX
diff --git a/src/ats/test_ats_api_bandwidth_consumption.c b/src/ats/test_ats_api_bandwidth_consumption.c
index 1eb57fcc8..9b09f5a49 100644
--- a/src/ats/test_ats_api_bandwidth_consumption.c
+++ b/src/ats/test_ats_api_bandwidth_consumption.c
@@ -28,9 +28,9 @@
#include "gnunet_ats_service.h"
#include "ats.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
diff --git a/src/ats/test_ats_api_scheduling.c b/src/ats/test_ats_api_scheduling.c
index fdff3e36d..9435a7b6f 100644
--- a/src/ats/test_ats_api_scheduling.c
+++ b/src/ats/test_ats_api_scheduling.c
@@ -34,9 +34,9 @@
#include "gnunet_ats_service.h"
#include "ats.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
diff --git a/src/ats/test_ats_api_update_address.c b/src/ats/test_ats_api_update_address.c
index f23747962..2607f536e 100644
--- a/src/ats/test_ats_api_update_address.c
+++ b/src/ats/test_ats_api_update_address.c
@@ -34,9 +34,9 @@
#include "gnunet_ats_service.h"
#include "gnunet_transport_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/ats/test_ats_mlp.c b/src/ats/test_ats_mlp.c
index bc066fec5..14df2d0df 100644
--- a/src/ats/test_ats_mlp.c
+++ b/src/ats/test_ats_mlp.c
@@ -31,7 +31,7 @@
#include "gnunet-service-ats_addresses_mlp.h"
#define VERBOSE GNUNET_YES
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define MLP_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
#define MLP_MAX_ITERATIONS INT_MAX
diff --git a/src/ats/test_ats_mlp_averaging.c b/src/ats/test_ats_mlp_averaging.c
index 0027e6d4d..f7b7b1d8f 100644
--- a/src/ats/test_ats_mlp_averaging.c
+++ b/src/ats/test_ats_mlp_averaging.c
@@ -31,7 +31,7 @@
#include "gnunet-service-ats_addresses_mlp.h"
#define VERBOSE GNUNET_YES
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define MLP_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
#define MLP_MAX_ITERATIONS INT_MAX
diff --git a/src/block/test_block.c b/src/block/test_block.c
index 927029ed8..e57b891ad 100644
--- a/src/block/test_block.c
+++ b/src/block/test_block.c
@@ -27,7 +27,7 @@
#define DEBUG GNUNET_EXTRA_LOGGING
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
static int
test_fs (struct GNUNET_BLOCK_Context *ctx)
diff --git a/src/chat/test_chat.c b/src/chat/test_chat.c
index b4e14f081..7cf8b19cf 100644
--- a/src/chat/test_chat.c
+++ b/src/chat/test_chat.c
@@ -37,7 +37,7 @@
#include "gnunet_arm_service.h"
#include "gnunet_chat_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/chat/test_chat_private.c b/src/chat/test_chat_private.c
index 03968975c..acec5bcf0 100644
--- a/src/chat/test_chat_private.c
+++ b/src/chat/test_chat_private.c
@@ -30,7 +30,7 @@
#include "gnunet_arm_service.h"
#include "gnunet_chat_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index 0f4fea419..77edbf925 100644
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -27,7 +27,7 @@
#include "gnunet_datacache_lib.h"
#include <gauger.h>
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0)
diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index 4f106d9e0..d8d2f05db 100644
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -26,7 +26,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_datacache_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0)
diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c
index 468972c9e..cc47bdb8f 100644
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -26,7 +26,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_datacache_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0)
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index 106d40684..393972da2 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -38,7 +38,7 @@
#include "gnunet_datastore_service.h"
#include <gauger.h>
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* How long until we give up on transmitting the message?
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index fe5a0a02e..186037429 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -29,7 +29,7 @@
#include "gnunet_datastore_plugin.h"
#include <gauger.h>
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* Target datastore size (in bytes). Realistic sizes are
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index df6d3af62..c93f5412e 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -31,7 +31,7 @@
#include "gnunet_protocols.h"
#include "gnunet_datastore_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define START_DATASTORE GNUNET_YES
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index 20a405d07..2d5cc6bf9 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -28,7 +28,7 @@
#include "gnunet_protocols.h"
#include "gnunet_datastore_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* How long until we give up on transmitting the message?
diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c
index ea9e85d70..16fe40ceb 100644
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -28,7 +28,7 @@
#include "gnunet_protocols.h"
#include "gnunet_datastore_plugin.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* Number of put operations to perform.
diff --git a/src/fragmentation/test_fragmentation.c b/src/fragmentation/test_fragmentation.c
index cbfb8efe4..c409bf3f0 100644
--- a/src/fragmentation/test_fragmentation.c
+++ b/src/fragmentation/test_fragmentation.c
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_fragmentation_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define DETAILS GNUNET_NO
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c
index 6b9b1abd5..32dcffa72 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -27,7 +27,7 @@
#include "fs_test_lib.h"
#include "gnunet_testing_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* File-size we use for testing.
diff --git a/src/fs/perf_gnunet_service_fs_p2p_trust.c b/src/fs/perf_gnunet_service_fs_p2p_trust.c
index 94b7648f8..c412e8482 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_trust.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_trust.c
@@ -47,7 +47,7 @@
#include "fs_test_lib.h"
#include "gnunet_testing_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* File-size we use for testing.
diff --git a/src/hello/test_hello.c b/src/hello/test_hello.c
index 6906a4113..0efbdee72 100644
--- a/src/hello/test_hello.c
+++ b/src/hello/test_hello.c
@@ -27,7 +27,7 @@
#define DEBUG GNUNET_EXTRA_LOGGING
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
static size_t
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index 91e0b3757..056e56177 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -27,7 +27,7 @@
#include "gnunet_arm_service.h"
#include "gnunet_transport_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 670fecc76..b27710677 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -30,7 +30,7 @@
#include "gnunet_resolver_service.h"
#include "gnunet_statistics_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
index 92cd7fcc5..e347673d8 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
@@ -28,7 +28,7 @@
#include "gnunet_arm_service.h"
#include "gnunet_transport_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/namestore/test_namestore_api.c b/src/namestore/test_namestore_api.c
index a72530d13..3fd84d20f 100644
--- a/src/namestore/test_namestore_api.c
+++ b/src/namestore/test_namestore_api.c
@@ -25,7 +25,7 @@
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c
index be65934d9..0b0008ff5 100644
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -26,7 +26,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_namestore_plugin.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0)
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index f81f00f6b..98b57b34d 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -41,7 +41,7 @@
#include "gnunet_nat_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c
index d4027ffcb..2c6da3b57 100644
--- a/src/nat/test_nat_mini.c
+++ b/src/nat/test_nat_mini.c
@@ -36,7 +36,7 @@
#include "gnunet_nat_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/* Time to wait before stopping NAT, in seconds */
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index c080e8ff3..2b9ef0f7c 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -31,7 +31,7 @@
#include "gnunet_nat_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c
index 4cd5e4349..28d066bf6 100644
--- a/src/nse/test_nse_multipeer.c
+++ b/src/nse/test_nse_multipeer.c
@@ -29,7 +29,7 @@
#include "gnunet_testing_lib.h"
#include "gnunet_nse_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define NUM_PEERS 4
diff --git a/src/statistics/test_statistics_api_loop.c b/src/statistics/test_statistics_api_loop.c
index f468c4ed8..eb739b752 100644
--- a/src/statistics/test_statistics_api_loop.c
+++ b/src/statistics/test_statistics_api_loop.c
@@ -29,7 +29,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_statistics_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define START_SERVICE GNUNET_YES
diff --git a/src/statistics/test_statistics_api_watch.c b/src/statistics/test_statistics_api_watch.c
index 1323e3ad1..a70b8b311 100644
--- a/src/statistics/test_statistics_api_watch.c
+++ b/src/statistics/test_statistics_api_watch.c
@@ -29,7 +29,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_statistics_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define START_SERVICE GNUNET_YES
diff --git a/src/template/test_template_api.c b/src/template/test_template_api.c
index 9302d0700..b98785116 100644
--- a/src/template/test_template_api.c
+++ b/src/template/test_template_api.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
static int
check ()
diff --git a/src/testing/test_testing_connect.c b/src/testing/test_testing_connect.c
index 87501469d..c69c20326 100644
--- a/src/testing/test_testing_connect.c
+++ b/src/testing/test_testing_connect.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_testing_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* How long until we give up on connecting the peers?
diff --git a/src/testing/test_testing_group.c b/src/testing/test_testing_group.c
index 0ed01cb51..f5df45b19 100644
--- a/src/testing/test_testing_group.c
+++ b/src/testing/test_testing_group.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_testing_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define NUM_PEERS 4
diff --git a/src/testing/test_testing_peergroup.c b/src/testing/test_testing_peergroup.c
index 8b8d32973..061a0ca75 100644
--- a/src/testing/test_testing_peergroup.c
+++ b/src/testing/test_testing_peergroup.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_testing_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define NUM_PEERS 4
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c
index 7404aa73e..ba5e23791 100644
--- a/src/testing/test_testing_topology.c
+++ b/src/testing/test_testing_topology.c
@@ -26,7 +26,7 @@
#include "gnunet_core_service.h"
#include "gnunet_os_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PROGRESS_BARS GNUNET_YES
diff --git a/src/testing/test_testing_topology_blacklist.c b/src/testing/test_testing_topology_blacklist.c
index d207ac2fc..ad39f7d62 100644
--- a/src/testing/test_testing_topology_blacklist.c
+++ b/src/testing/test_testing_topology_blacklist.c
@@ -25,7 +25,7 @@
#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* How long until we fail the whole testcase?
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index ae08136e3..8a3ec44d4 100644
--- a/src/testing/testing_group.c
+++ b/src/testing/testing_group.c
@@ -30,9 +30,9 @@
#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
-#define VERBOSE_TESTING GNUNET_EXTRA_LOGGING
+#define VERBOSE_TESTING GNUNET_NO
-#define VERBOSE_TOPOLOGY GNUNET_EXTRA_LOGGING
+#define VERBOSE_TOPOLOGY GNUNET_NO
#define DEBUG_CHURN GNUNET_EXTRA_LOGGING
diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c
index 65a313d44..7592ede1d 100644
--- a/src/topology/test_gnunet_daemon_topology.c
+++ b/src/topology/test_gnunet_daemon_topology.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_testing_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define NUM_PEERS 2
diff --git a/src/transport/gnunet-transport-connect-running-peers.c b/src/transport/gnunet-transport-connect-running-peers.c
index 8ba81891f..a640f38ab 100644
--- a/src/transport/gnunet-transport-connect-running-peers.c
+++ b/src/transport/gnunet-transport-connect-running-peers.c
@@ -36,9 +36,9 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 56abe2cd3..794c8311d 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -37,7 +37,7 @@
#include "gnunet_transport_plugin.h"
#include "transport.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* How long until we give up on transmitting the message?
diff --git a/src/transport/test_plugin_transport_udp.c b/src/transport/test_plugin_transport_udp.c
index 1b0ec91f6..8fbd2ab9c 100644
--- a/src/transport/test_plugin_transport_udp.c
+++ b/src/transport/test_plugin_transport_udp.c
@@ -38,7 +38,7 @@
#include "gnunet_transport_plugin.h"
#include "transport.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* How long until we give up on transmitting the message?
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index cbf19d4da..b0111cc89 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -38,7 +38,7 @@
#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 9cc769ef1..7596c30b1 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -37,8 +37,8 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api_bidirectional_connect.c b/src/transport/test_transport_api_bidirectional_connect.c
index b4a3ca41d..a54d0891a 100644
--- a/src/transport/test_transport_api_bidirectional_connect.c
+++ b/src/transport/test_transport_api_bidirectional_connect.c
@@ -35,8 +35,8 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c
index fc5ffda55..f8f6040a9 100644
--- a/src/transport/test_transport_api_blacklisting.c
+++ b/src/transport/test_transport_api_blacklisting.c
@@ -35,8 +35,8 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c
index 1a73bcb5f..99271446c 100644
--- a/src/transport/test_transport_api_disconnect.c
+++ b/src/transport/test_transport_api_disconnect.c
@@ -34,8 +34,8 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c
index d1aa6e40d..015c28c16 100644
--- a/src/transport/test_transport_api_limited_sockets.c
+++ b/src/transport/test_transport_api_limited_sockets.c
@@ -37,9 +37,9 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index eb03564d5..521126885 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -38,9 +38,9 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api_restart_1peer.c b/src/transport/test_transport_api_restart_1peer.c
index 0f6264607..c9db9da64 100644
--- a/src/transport/test_transport_api_restart_1peer.c
+++ b/src/transport/test_transport_api_restart_1peer.c
@@ -36,8 +36,8 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api_restart_2peers.c b/src/transport/test_transport_api_restart_2peers.c
index 3de91d62a..ef97911c0 100644
--- a/src/transport/test_transport_api_restart_2peers.c
+++ b/src/transport/test_transport_api_restart_2peers.c
@@ -36,8 +36,8 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c
index 35279ff76..8a392949c 100644
--- a/src/transport/test_transport_api_timeout.c
+++ b/src/transport/test_transport_api_timeout.c
@@ -38,9 +38,9 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c
index 413daabc9..fce8d8565 100644
--- a/src/transport/test_transport_api_unreliability.c
+++ b/src/transport/test_transport_api_unreliability.c
@@ -41,7 +41,7 @@
#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_api_unreliability_constant.c b/src/transport/test_transport_api_unreliability_constant.c
index 52bf63833..a75f2953e 100644
--- a/src/transport/test_transport_api_unreliability_constant.c
+++ b/src/transport/test_transport_api_unreliability_constant.c
@@ -39,9 +39,9 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_startonly.c b/src/transport/test_transport_startonly.c
index 36d9b18d3..79578ab53 100644
--- a/src/transport/test_transport_startonly.c
+++ b/src/transport/test_transport_startonly.c
@@ -37,9 +37,9 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/transport/test_transport_testing.c b/src/transport/test_transport_testing.c
index be8c547cc..842d68651 100644
--- a/src/transport/test_transport_testing.c
+++ b/src/transport/test_transport_testing.c
@@ -37,9 +37,9 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
diff --git a/src/util/test_client.c b/src/util/test_client.c
index bb7d5008a..f9d961ab6 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -29,7 +29,7 @@
#include "gnunet_server_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 14325
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index d1f264c70..b6b9d6178 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -30,7 +30,7 @@
#include "gnunet_disk_lib.h"
#include "gnunet_os_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
static int ok;
static int phase = 0;
diff --git a/src/util/test_connection.c b/src/util/test_connection.c
index 92c0cea2e..cb69f4036 100644
--- a/src/util/test_connection.c
+++ b/src/util/test_connection.c
@@ -27,7 +27,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 12435
diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index 018cf61fb..2d08acc3c 100644
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -27,7 +27,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 12435
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c
index 63829344d..aa1672455 100644
--- a/src/util/test_connection_receive_cancel.c
+++ b/src/util/test_connection_receive_cancel.c
@@ -27,7 +27,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 12435
diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c
index 1700718b9..2338665cb 100644
--- a/src/util/test_connection_timeout.c
+++ b/src/util/test_connection_timeout.c
@@ -27,7 +27,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 12435
diff --git a/src/util/test_connection_timeout_no_connect.c b/src/util/test_connection_timeout_no_connect.c
index b598907ec..2e8f9be2e 100644
--- a/src/util/test_connection_timeout_no_connect.c
+++ b/src/util/test_connection_timeout_no_connect.c
@@ -27,7 +27,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 13425
diff --git a/src/util/test_connection_transmit_cancel.c b/src/util/test_connection_transmit_cancel.c
index 50308a2d0..d81c32a6c 100644
--- a/src/util/test_connection_transmit_cancel.c
+++ b/src/util/test_connection_transmit_cancel.c
@@ -27,7 +27,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 12435
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index f66e741d9..178a1d9ef 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -33,7 +33,7 @@
#include "gnunet_scheduler_lib.h"
#include "disk.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
static char *test_phrase = "HELLO WORLD";
static int ok;
diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c
index 4635e1357..428cdaffb 100644
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_plugin_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
static void
test_cb (void *cls, const char *libname, void *lib_ret)
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index d23bddbd5..4ad5a2cf5 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -30,7 +30,7 @@
#include "gnunet_resolver_service.h"
#include "resolver.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
/**
* Using DNS root servers to check gnunet's resolver service
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index 8072feaf1..01982ee8b 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -27,7 +27,7 @@
#include "gnunet_time_lib.h"
#include "gnunet_disk_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
static void
task3 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
diff --git a/src/util/test_scheduler_delay.c b/src/util/test_scheduler_delay.c
index 9cbf7d90f..8ba35f5b9 100644
--- a/src/util/test_scheduler_delay.c
+++ b/src/util/test_scheduler_delay.c
@@ -28,7 +28,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
static struct GNUNET_TIME_Absolute target;
diff --git a/src/util/test_server.c b/src/util/test_server.c
index 625829042..6718c65d8 100644
--- a/src/util/test_server.c
+++ b/src/util/test_server.c
@@ -28,7 +28,7 @@
#include "gnunet_server_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 12435
diff --git a/src/util/test_server_disconnect.c b/src/util/test_server_disconnect.c
index 69207f81a..8010695e8 100644
--- a/src/util/test_server_disconnect.c
+++ b/src/util/test_server_disconnect.c
@@ -28,7 +28,7 @@
#include "gnunet_server_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 12435
diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c
index 5b6e51718..06a4b71d6 100644
--- a/src/util/test_server_with_client.c
+++ b/src/util/test_server_with_client.c
@@ -30,7 +30,7 @@
#include "gnunet_server_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 22335
diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c
index 4f80f188c..99af4e8c3 100644
--- a/src/util/test_server_with_client_unix.c
+++ b/src/util/test_server_with_client_unix.c
@@ -30,7 +30,7 @@
#include "gnunet_server_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define MY_TYPE 128
diff --git a/src/util/test_service.c b/src/util/test_service.c
index eff8c7570..049282d84 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -31,7 +31,7 @@
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define PORT 12435
diff --git a/src/util/test_strings.c b/src/util/test_strings.c
index 7e68153d7..88de0b81b 100644
--- a/src/util/test_strings.c
+++ b/src/util/test_strings.c
@@ -25,7 +25,7 @@
#include "gnunet_common.h"
#include "gnunet_strings_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define WANT(a,b) if (0 != strcmp(a,b)) { fprintf(stderr, "Got `%s', wanted `%s'\n", b, a); GNUNET_free(b); GNUNET_break(0); return 1;} else { GNUNET_free (b); }
#define WANTB(a,b,l) if (0 != memcmp(a,b,l)) { GNUNET_break(0); return 1;} else { }
diff --git a/src/util/test_time.c b/src/util/test_time.c
index c5232ff2a..788884fcc 100644
--- a/src/util/test_time.c
+++ b/src/util/test_time.c
@@ -25,7 +25,7 @@
#include "gnunet_common.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
static int
check ()