aboutsummaryrefslogtreecommitdiff
path: root/src/topology/test_gnunet_daemon_topology.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-05-06 17:47:03 +0000
committerChristian Grothoff <christian@grothoff.org>2012-05-06 17:47:03 +0000
commitb2e7a0706c2810c62282d6f4c9233da7ab1c283e (patch)
treea387a98a9eb1999517b1cd8733ffa7f04722e41c /src/topology/test_gnunet_daemon_topology.c
parent45e31f540e8d0f559a992be42e5eb9387cc5a0c2 (diff)
downloadgnunet-b2e7a0706c2810c62282d6f4c9233da7ab1c283e.tar.gz
gnunet-b2e7a0706c2810c62282d6f4c9233da7ab1c283e.zip
-noverbose
Diffstat (limited to 'src/topology/test_gnunet_daemon_topology.c')
-rw-r--r--src/topology/test_gnunet_daemon_topology.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c
index 7592ede1d..35225e4da 100644
--- a/src/topology/test_gnunet_daemon_topology.c
+++ b/src/topology/test_gnunet_daemon_topology.c
@@ -24,7 +24,6 @@
24#include "platform.h" 24#include "platform.h"
25#include "gnunet_testing_lib.h" 25#include "gnunet_testing_lib.h"
26 26
27#define VERBOSE GNUNET_NO
28 27
29#define NUM_PEERS 2 28#define NUM_PEERS 2
30 29
@@ -61,17 +60,13 @@ shutdown_callback (void *cls, const char *emsg)
61{ 60{
62 if (emsg != NULL) 61 if (emsg != NULL)
63 { 62 {
64#if VERBOSE
65 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n"); 63 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n");
66#endif
67 if (ok == 0) 64 if (ok == 0)
68 ok = 666; 65 ok = 666;
69 } 66 }
70 else 67 else
71 { 68 {
72#if VERBOSE
73 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers successfully shut down!\n"); 69 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers successfully shut down!\n");
74#endif
75 } 70 }
76} 71}
77 72
@@ -165,9 +160,7 @@ run (void *cls, char *const *args, const char *cfgfile,
165 const struct GNUNET_CONFIGURATION_Handle *cfg) 160 const struct GNUNET_CONFIGURATION_Handle *cfg)
166{ 161{
167 ok = 1; 162 ok = 1;
168#if VERBOSE
169 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n"); 163 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
170#endif
171 peers_left = NUM_PEERS; 164 peers_left = NUM_PEERS;
172 pg = GNUNET_TESTING_daemons_start (cfg, peers_left, peers_left, peers_left, 165 pg = GNUNET_TESTING_daemons_start (cfg, peers_left, peers_left, peers_left,
173 TIMEOUT, NULL, NULL, &my_cb, NULL, NULL, 166 TIMEOUT, NULL, NULL, &my_cb, NULL, NULL,
@@ -183,9 +176,6 @@ check ()
183 "test-gnunet-daemon-topology", 176 "test-gnunet-daemon-topology",
184 "-c", 177 "-c",
185 "test_gnunet_daemon_topology_data.conf", 178 "test_gnunet_daemon_topology_data.conf",
186#if VERBOSE
187 "-L", "DEBUG",
188#endif
189 NULL 179 NULL
190 }; 180 };
191 struct GNUNET_GETOPT_CommandLineOption options[] = { 181 struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -204,11 +194,7 @@ main (int argc, char *argv[])
204 int ret; 194 int ret;
205 195
206 GNUNET_log_setup ("test-gnunet-daemon-topology", 196 GNUNET_log_setup ("test-gnunet-daemon-topology",
207#if VERBOSE
208 "DEBUG",
209#else
210 "WARNING", 197 "WARNING",
211#endif
212 NULL); 198 NULL);
213 ret = check (); 199 ret = check ();
214 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-topology"); 200 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-topology");