From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 4 May 2012 11:44:23 +0000 (+0000)
Subject: -fixes:
X-Git-Tag: initial-import-from-subversion-38251~13680
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=10b928da1c55074405e8a8fbbae67299dd214587;p=oweals%2Fgnunet.git

-fixes:
---

diff --git a/src/testing/test_testing_2dtorus.conf b/src/testing/test_testing_2dtorus.conf
index ba1db3a6b..54bb7c5a7 100644
--- a/src/testing/test_testing_2dtorus.conf
+++ b/src/testing/test_testing_2dtorus.conf
@@ -1,6 +1,7 @@
+@INLINE@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test_testing_small/
-DEFAULTCONFIG = test_testing_small.conf
+SERVICEHOME = /tmp/test_testing_2dtorus/
+DEFAULTCONFIG = test_testing_2dtorus.conf
 
 [arm]
 PORT = 10010
@@ -29,6 +30,7 @@ PORT = 10011
 [transport]
 PORT = 10002
 AUTOSTART = YES
+PLUGINS = tcp
 
 [nat]
 DISABLEV6 = YES 
diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf
index 45fd69040..cbdaceb5a 100644
--- a/src/testing/test_testing_data_topology_2d_torus.conf
+++ b/src/testing/test_testing_data_topology_2d_torus.conf
@@ -1,8 +1,7 @@
 @INLINE@ test_testing_defaults.conf
 [PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
+DEFAULTCONFIG = test_testing_data_topology_2d_torus.conf
 
 [TESTING]
 NUM_PEERS = 13
 TOPOLOGY = 2D_TORUS
-