From: Bart Polot <bart@net.in.tum.de>
Date: Thu, 6 Oct 2011 11:34:50 +0000 (+0000)
Subject: Tweaked configuration files and testcase
X-Git-Tag: initial-import-from-subversion-38251~16746
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b1a2980791116f9c8d02fadbc4a70a9747e02718;p=oweals%2Fgnunet.git

Tweaked configuration files and testcase
---

diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index a23b07b41..c6a6dff2e 100644
--- 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 a23b07b41..c6a6dff2e 100644
--- 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 fb8867939..98def94c0 100644
--- 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 cf611e949..92e5d078b 100644
--- 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