[GNUnet-SVN] r13265 - gnunet/src/testing

[gnunet]

Author: nevans
Date: 2010-10-12 15:45:56 +0200 (Tue, 12 Oct 2010)
New Revision: 13265

Modified:
   gnunet/src/testing/test_testing_topology.c
   gnunet/src/testing/test_testing_topology_blacklist.c
   gnunet/src/testing/testing_group.c
Log:
remove debugging stuff, fix for very small values of small world options

Modified: gnunet/src/testing/test_testing_topology.c
===================================================================
--- gnunet/src/testing/test_testing_topology.c  2010-10-12 13:19:00 UTC (rev 
13264)
+++ gnunet/src/testing/test_testing_topology.c  2010-10-12 13:45:56 UTC (rev 
13265)
@@ -26,7 +26,7 @@
 #include "gnunet_core_service.h"
 #include "gnunet_os_lib.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define DELAY_FOR_LOGGING GNUNET_NO
 
@@ -709,8 +709,10 @@
 static void topology_creation_finished (void *cls,
                                         const char *emsg)
 {
+#if VERBOSE
   if (emsg == NULL)
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "All topology connections created 
successfully!\n");
+#endif
 }
 
 static void

Modified: gnunet/src/testing/test_testing_topology_blacklist.c
===================================================================
--- gnunet/src/testing/test_testing_topology_blacklist.c        2010-10-12 
13:19:00 UTC (rev 13264)
+++ gnunet/src/testing/test_testing_topology_blacklist.c        2010-10-12 
13:45:56 UTC (rev 13265)
@@ -25,7 +25,7 @@
 #include "gnunet_testing_lib.h"
 #include "gnunet_core_service.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 /**
  * How long until we fail the whole testcase?

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2010-10-12 13:19:00 UTC (rev 13264)
+++ gnunet/src/testing/testing_group.c  2010-10-12 13:45:56 UTC (rev 13265)
@@ -1554,6 +1554,8 @@
 #endif
   smallWorldConnections = 0;
   small_world_it = (unsigned int)(natLog * percentage);
+  if (small_world_it < 1)
+    small_world_it = 1;
   GNUNET_assert(small_world_it > 0 && small_world_it < (unsigned int)-1);
   for (i = 0; i < small_world_it; i++)
     {