Tweaked configuration files and testcase

diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index a23b07b41d2941747618d28dcaacee7f7b49441c..c6a6dff2e1df3e80dd384a6b4c29e2a275ef3993 100644 (file)
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -10,7 +10,7 @@ AUTOSTART = YES
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 PORT = 10511
-PREFIX = valgrind --leak-check=full
+# PREFIX = valgrind --leak-check=full
 # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
 [dht]

diff --git a/src/mesh/test_mesh_path.conf b/src/mesh/test_mesh_path.conf
index a23b07b41d2941747618d28dcaacee7f7b49441c..c6a6dff2e1df3e80dd384a6b4c29e2a275ef3993 100644 (file)
--- a/src/mesh/test_mesh_path.conf
+++ b/src/mesh/test_mesh_path.conf
@@ -10,7 +10,7 @@ AUTOSTART = YES
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 PORT = 10511
-PREFIX = valgrind --leak-check=full
+# PREFIX = valgrind --leak-check=full
 # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
 [dht]

diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index fb88679396d39a2d31933d0b014a786bf66de794..98def94c0272ad40e1dfa5160b9b71857f40bfa5 100644 (file)
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -53,7 +53,7 @@ DEBUG=YES
 [testing]
 NUM_PEERS = 16
 WEAKRANDOM = YES
-TOPOLOGY = FROM_FILE
+TOPOLOGY = 2D_TORUS
 CONNECT_TOPOLOGY = NONE
 TOPOLOGY_FILE = small.dat
 #CONNECT_TOPOLOGY = ERDOS_RENYI

diff --git a/src/mesh/test_mesh_small_unicast.c b/src/mesh/test_mesh_small_unicast.c
index cf611e949529a1dc57f5a7c6fa87e6a763e5633f..92e5d078b750be3c41aded18be0934e58108d0e8 100644 (file)
--- a/src/mesh/test_mesh_small_unicast.c
+++ b/src/mesh/test_mesh_small_unicast.c
@@ -300,7 +300,7 @@ connect_mesh_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: connect_mesh_service\n");
 
   d1 = GNUNET_TESTING_daemon_get (pg, 1);
-  d2 = GNUNET_TESTING_daemon_get (pg, 13);
+  d2 = GNUNET_TESTING_daemon_get (pg, 3);
   app = (GNUNET_MESH_ApplicationType) 0;
 
 #if VERBOSE